mirror of
https://github.com/Atmosphere-NX/Atmosphere.git
synced 2025-06-28 05:52:38 +02:00
Fix some errors
Signed-off-by: Mako <61922615+Makonede@users.noreply.github.com>
This commit is contained in:
parent
06ee47c04c
commit
660d6ddcc1
@ -29,7 +29,7 @@ namespace ams::ldr {
|
|||||||
|
|
||||||
/* Convenience defines. */
|
/* Convenience defines. */
|
||||||
constexpr size_t SystemResourceSizeMax = 0x1FE00000;
|
constexpr size_t SystemResourceSizeMax = 0x1FE00000;
|
||||||
constexpr ncm::ProgramId BREATH_OF_THE_WILD = 0x01007EF00011E000;
|
constexpr ncm::ProgramId BREATH_OF_THE_WILD{ 0x01007EF00011E000 };
|
||||||
constexpr const char *ASLR_CONFIG = "sdmc:/atmosphere/config/aslr.txt";
|
constexpr const char *ASLR_CONFIG = "sdmc:/atmosphere/config/aslr.txt";
|
||||||
|
|
||||||
/* Types. */
|
/* Types. */
|
||||||
@ -455,7 +455,7 @@ namespace ams::ldr {
|
|||||||
out->nso_size[i] = text_end;
|
out->nso_size[i] = text_end;
|
||||||
out->nso_size[i] = std::max(out->nso_size[i], ro_end);
|
out->nso_size[i] = std::max(out->nso_size[i], ro_end);
|
||||||
out->nso_size[i] = std::max(out->nso_size[i], rw_end);
|
out->nso_size[i] = std::max(out->nso_size[i], rw_end);
|
||||||
out->nso_size[i] = util::AlignUp(out->nso_size[i], out_param->program_id != BREATH_OF_THE_WILD || i ? os::MemoryPageSize : os::MemoryBlockUnitSize);
|
out->nso_size[i] = util::AlignUp(out->nso_size[i], out_param->program_id.value != BREATH_OF_THE_WILD || i ? os::MemoryPageSize : os::MemoryBlockUnitSize);
|
||||||
|
|
||||||
total_size += out->nso_size[i];
|
total_size += out->nso_size[i];
|
||||||
|
|
||||||
@ -512,7 +512,7 @@ namespace ams::ldr {
|
|||||||
else {
|
else {
|
||||||
fs::FileHandle aslr;
|
fs::FileHandle aslr;
|
||||||
if (R_SUCCEEDED(fs::OpenFile(std::addressof(aslr), ASLR_CONFIG, fs::OpenMode_Read))) {
|
if (R_SUCCEEDED(fs::OpenFile(std::addressof(aslr), ASLR_CONFIG, fs::OpenMode_Read))) {
|
||||||
ON_SCOPE_EXIT { fs::CloseFile(aslr); }
|
ON_SCOPE_EXIT { fs::CloseFile(aslr); };
|
||||||
|
|
||||||
size_t read_size;
|
size_t read_size;
|
||||||
uintptr_t address = 0;
|
uintptr_t address = 0;
|
||||||
@ -678,7 +678,7 @@ namespace ams::ldr {
|
|||||||
|
|
||||||
/* Process Creation API. */
|
/* Process Creation API. */
|
||||||
Result CreateProcess(os::NativeHandle *out, PinId pin_id, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &override_status, const char *path, const ArgumentStore::Entry *argument, u32 flags, os::NativeHandle resource_limit, PlatformId platform) {
|
Result CreateProcess(os::NativeHandle *out, PinId pin_id, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &override_status, const char *path, const ArgumentStore::Entry *argument, u32 flags, os::NativeHandle resource_limit, PlatformId platform) {
|
||||||
if (loc->program_id == BREATH_OF_THE_WILD) flags |= svc::CreateProcessFlag_DisableAslr;
|
if (loc.program_id == BREATH_OF_THE_WILD) flags |= CreateProcessFlag_DisableAslr;
|
||||||
|
|
||||||
/* Mount code. */
|
/* Mount code. */
|
||||||
AMS_UNUSED(path);
|
AMS_UNUSED(path);
|
||||||
|
Loading…
Reference in New Issue
Block a user