OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loader: support 11.x DisableDeviceAddressSpaceMerge

Browse Source
This commit is contained in:
Michael Scire
2020-12-01 17:47:48 -08:00
parent f089cd4b76
commit 95bbb20cb0
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
stratosphere/loader/source/ldr_meta.cpp
View File

@@ -55,11 +55,20 @@ namespace ams::ldr {
R_UNLESS(npdm->magic == Npdm::Magic, ResultInvalidMeta());
/* Validate flags. */
u32 mask = ~0x1F;
if (hos::GetVersion() < hos::Version_7_0_0) {
/* 7.0.0 added 0x10 as a valid bit to NPDM flags, so before that we only check 0xF. */
u32 mask;
if (hos::GetVersion() >= hos::Version_11_0_0) {
/* 11.0.0 added bit 5 = "DisableDeviceAddressSpaceMerge". */
mask = ~0x3F;
} else if (hos::GetVersion() >= hos::Version_7_0_0) {
/* 7.0.0 added bit 4 = "UseOptimizedMemory" */
mask = ~0x1F;
} else {
mask = ~0xF;
}
/* We set the "DisableDeviceAddressSpaceMerge" bit on all versions, so be permissive with it. */
mask &= ~0x20;
R_UNLESS(!(npdm->flags & mask), ResultInvalidMeta());
/* Validate Acid extents. */