docs: add basic changelog for 1.3.0

README.md

@@ -38,7 +38,7 @@ In no particular order, we credit the following for their invaluable contributio
 
 * __switchbrew__ for the [libnx](https://github.com/switchbrew/libnx) project and the extensive [documentation, research and tool development](http://switchbrew.org) pertaining to the Nintendo Switch.
 * __devkitPro__ for the [devkitA64](https://devkitpro.org/) toolchain and libnx support.
-* __ReSwitched Team__ for additional [documentation, research and tool development](https://reswitched.github.io/) pertaining to the Nintendo Switch.
+* __ReSwitched Team__ for additional [documentation, research and tool development](https://reswitched.team/) pertaining to the Nintendo Switch.
 * __ChaN__ for the [FatFs](http://elm-chan.org/fsw/ff/00index_e.html) module.
 * __Marcus Geelnard__ for the [bcl-1.2.0](https://sourceforge.net/projects/bcl/files/bcl/bcl-1.2.0) library.
 * __naehrwert__ and __st4rk__ for the original [hekate](https://github.com/nwert/hekate) project and its hwinit code base.

config_templates/system_settings.ini

@@ -67,10 +67,6 @@
 ; Note that this setting is ignored (and treated as 1) when htc is enabled.
 ; 0 = Disabled, 1 = Enabled
 ; enable_log_manager = u8!0x0
-; Controls whether the bluetooth pairing database is redirected to the SD card (shared across sysmmc/all emummcs)
-; NOTE: On <13.0.0, the database size was 10 instead of 20; booting pre-13.0.0 will truncate the database.
-; 0 = Disabled, 1 = Enabled
-; enable_external_bluetooth_db = u8!0x0
 [hbloader]
 ; Controls the size of the homebrew heap when running as applet.
 ; If set to zero, all available applet memory is used as heap.

docs/changelog.md

@@ -1,67 +1,4 @@
 # Changelog
-## 1.5.1
-+ `fatal` was updated to reduce memory footprint.
-  + Starting in 16.0.0, official `fatal` has no framebuffer or rendering logic, and instead calls other system service commands to draw the screen.
-  + However, these commands aren't usable by atmosphère (too small rendering window, bad color support).
-  + To reduce the relative memory footprint differential between atmosphère and official code, the framebuffer (2 MB) is now dynamically allocated when needed.
-    + This will try to allocate from multiple pools (preferring System > System_NonSecure > Application).
-    + This technically requires that 2 MB be available in at least one of these pools for the fatal screen to render (otherwise, a reboot-to-black-and-white-fatal will occur), but this should be a non-issue in almost all cases.
-+ A feature was added to optionally mirror the bluetooth pairing database to the SD card (thanks @ndeadly).
-  + This allows device pairings to be automatically kept in-sync across sysmmc/all emummcs.
-  + This is opt-in, and can be controlled by setting `atmosphere!enable_external_bluetooth_db = u8!0x1`.
-  + When enabled, the pairing database will be synchronized to `/atmosphere/bluetooth_devices.db`.
-+ General system stability improvements to enhance the user's experience.
-## 1.5.0
-+ Support was added for 16.0.0
-  + `mesosphère` was updated to reflect the latest official kernel behavior.
-  + `ncm` was updated to reflect the latest official behavior.
-  + Many FS apis were updated under the hood to reflect the latest official behavior.
-  + **Please Note**: 16.0.0 made breaking changes to a number of system APIs, including in FS/NCM/Shared Font commands that some homebrew programs may use.
-    + These programs may encounter strange errors, and may need to be recompiled with a libnx updated to support 16.0.0's changes to function properly.
-+ A number of minor issues were fixed and improvements were made, including:
-  + An issue was fixed that could cause GPIO outputs to be misconfigured under certain circumstances.
-+ General system stability improvements to enhance the user's experience.
-## 1.4.1
-+ A number of minor issues were fixed and improvements were made, including:
-  + `dmnt` cheat toggle files are no longer ignored when they are missing a trailing newline.
-  + The mechanism for automatically cleaning up `erpt_reports` added in 1.3.0 was fixed.
-    + This was actually just very fundamentally broken and has never worked, but it is verified working now.
-  + Minor fixes were made in `mesosphère` to match official kernel behavior (spin lock assembly was corrected, wrong result on failure in in GetProcessId was corrected).
-  + A missing call to GetSdStatus when initializing SD cards at non uhs-i mode was added in the sdmmc driver.
-+ `ams.mitm`'s memory usage was increased by 16 MB, to prevent crashing when building romfs for games with obscene file counts.
-  + To quote the changelog for 1.2.3: "Animal Crossing's 2.0.0 update contains >99000 files [...] It's really hard to imagine any game being worse than Animal Crossing".
-  + As it turns out, Fire Emblem: Engage has ~186000 files, and is approximately twice as bad as animal crossing.
-  + The additional memory here is taken from the applet pool; no issues are expected to arise from this, but please report anything you may run into.
-  + As usual, if you encounter a game that exhausts ams.mitm's memory (crashing it) when loading layeredfs mods, please contact `SciresM#0524`.
-    + I am jinxing myself by saying this, but it's really hard to imagine any game being worse than Fire Emblem: Engage, but if it happens again I will drop everything to fix it as usual.
-## 1.4.0
-+ Support was added for 15.0.0.
-  + `mesosphère` was updated to reflect the latest official kernel behavior.
-  + `ncm` was updated to reflect the latest official behavior.
-+ A number of minor issues were fixed and improvements were made, including:
-  + The capacity limit on registered add-on contents was fixed in NCM to reflect the increase that occurred in 12.0.0.
-  + An off-by-one was fixed in mesosphere when computing the new value for an address arbiter signaled with ModifyByWaitingCountIfEqual.
-  + dmnt.gen2's gdbstub now sanitizes thread names to prevent invalid characters from breaking gdb.
-  + dmnt.gen2's gdbstub now reports the architecture tag correctly when attached to 32-bit processes.
-  + Support for program-specific html manual content overrides was added for non-hbl takeover context.
-  + A bug was fixed in how emummc constructed the alternate Nintendo directory path.
-    + Previously, this was using `/*/Nintendo/Nintendo` instead of `/*/Nintendo`.
-    + Code was added to automatically move the old folders to the new ones when booting into emummc.
-  + A bug was fixed in boot that caused an incorrectly low input voltage limit to be set.
-+ General system stability improvements to enhance the user's experience.
-## 1.3.2
-+ Support was improved for 14.0.0+.
-  + `loader` was updated to reflect the latest official behaviors.
-  + `ro` was  updated to reflect the latest official behaviors.
-+ A number of minor issues were fixed and improvements were made, including:
-  + A memory leak was fixed in filesystem path management; this could cause a crash when launching games ~100 times, or when deleting/re-downloading games.
-  + A bug was fixed that could cause threads to not see a newly signaled semaphore.
-  + A number of minor inaccuracies were fixed in the updated FileSystem APIs.
-+ General system stability improvements to enhance the user's experience.
-## 1.3.1
-+ Support was added for 14.1.0.
-+ A number of minor under the hood improvements to accuracy were made to better reflect latest official system module behavior, particularly around FS apis.
-+ General system stability improvements to enhance the user's experience.
 ## 1.3.0
 + Support was added for 14.0.0.
   + `mesosphère` was updated to reflect the latest official kernel behavior.
@@ -78,10 +15,9 @@
     + If you are a developer interested in adding support for another target, please reach out to `SciresM#0524` on discord.
   + This is intended to finally allow sanely testing Atmosphère's code, by allowing most of it to run on a PC (with access to a debugger) instead of on game console hardware.
   + In addition, this will allow making PC tools which reuse code written for Atmosphère directly..
-  + **Please Note**: This has no relation to interacting with official software on PC whatsoever. This really allows for making tests and self-contained atmosphère-based command-line tools; the Atmosphère project continues to have zero interest in attempting to run official software of any kind.
-  + In the course of adding this support (and working on tooling using it), a number of fairly major revisions were made to stratosphere (particularly surrounding filesystem code).
-    + **Please Note**: A number of changes made for this (and ones necessary in the process of adding support for 14.0.0) are api-breaking.
-      + If you're a developer and any of this caused your code to break, please feel free to contact `SciresM#0524` for help updating your program.
+  + **Please Note**: This has no relation to interacting with official software on PC whatsoever. This does not and is not intended to enable anything with official software, it only really allows for making tests and self-contained atmosphère-based tools.
+  + In the course of adding this support (and working on tooling using it), a number of major revisions were added to stratosphere:
+    +
 + General system stability improvements to enhance the user's experience.
 ## 1.2.6
 + Support was added for 13.2.1.

emummc/.gitrepo

@@ -4,9 +4,9 @@
 ; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
 ;
 [subrepo]
-	remote = https://github.com/m4xw/emummc
+	remote = https://github.com/m4xw/emuMMC
 	branch = develop
-	commit = bba1f1fb65f75721caf6d023a35d75d3c9aafd0f
-	parent = 1ab8b234447864503e21c600681219a96962e6c1
+	commit = a9d56959460fc794ce2cb6405402c25a3e89c47f
+	parent = ff719641396c635b735873fb2b020c910f768a04
 	method = merge
 	cmdver = 0.4.1

emummc/README.md

@@ -2,7 +2,7 @@
 *A SDMMC driver replacement for Nintendo's Filesystem Services, by **m4xw***  
 
 ### Supported Horizon Versions
-**1.0.0 - 16.0.0**
+**1.0.0 - 13.1.0**
 
 ## Features
 * Arbitrary SDMMC backend selection  

emummc/source/FS/FS_offsets.c

@@ -61,10 +61,6 @@
 #include "offsets/1310_exfat.h"
 #include "offsets/1400.h"
 #include "offsets/1400_exfat.h"
-#include "offsets/1500.h"
-#include "offsets/1500_exfat.h"
-#include "offsets/1600.h"
-#include "offsets/1600_exfat.h"
 #include "../utils/fatal.h"
 
 #define GET_OFFSET_STRUCT_NAME(vers) g_offsets##vers
@@ -137,10 +133,6 @@ DEFINE_OFFSET_STRUCT(_1310);
 DEFINE_OFFSET_STRUCT(_1310_EXFAT);
 DEFINE_OFFSET_STRUCT(_1400);
 DEFINE_OFFSET_STRUCT(_1400_EXFAT);
-DEFINE_OFFSET_STRUCT(_1500);
-DEFINE_OFFSET_STRUCT(_1500_EXFAT);
-DEFINE_OFFSET_STRUCT(_1600);
-DEFINE_OFFSET_STRUCT(_1600_EXFAT);
 
 const fs_offsets_t *get_fs_offsets(enum FS_VER version) {
     switch (version) {
@@ -234,14 +226,6 @@ const fs_offsets_t *get_fs_offsets(enum FS_VER version) {
             return &(GET_OFFSET_STRUCT_NAME(_1400));
         case FS_VER_14_0_0_EXFAT:
             return &(GET_OFFSET_STRUCT_NAME(_1400_EXFAT));
-        case FS_VER_15_0_0:
-            return &(GET_OFFSET_STRUCT_NAME(_1500));
-        case FS_VER_15_0_0_EXFAT:
-            return &(GET_OFFSET_STRUCT_NAME(_1500_EXFAT));
-        case FS_VER_16_0_0:
-            return &(GET_OFFSET_STRUCT_NAME(_1600));
-        case FS_VER_16_0_0_EXFAT:
-            return &(GET_OFFSET_STRUCT_NAME(_1600_EXFAT));
         default:
             fatal_abort(Fatal_UnknownVersion);
     }

emummc/source/FS/FS_versions.h

@@ -89,12 +89,6 @@ enum FS_VER
     FS_VER_14_0_0,
     FS_VER_14_0_0_EXFAT,
 
-    FS_VER_15_0_0,
-    FS_VER_15_0_0_EXFAT,
-
-    FS_VER_16_0_0,
-    FS_VER_16_0_0_EXFAT,
-
     FS_VER_MAX,
 };
 

emummc/source/FS/offsets/1500.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef __FS_1500_H__
-#define __FS_1500_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1500_SDMMC_ACCESSOR_GC   0x183E20
-#define FS_OFFSET_1500_SDMMC_ACCESSOR_SD   0x185AA0
-#define FS_OFFSET_1500_SDMMC_ACCESSOR_NAND 0x1842E0
-
-// Hooks
-#define FS_OFFSET_1500_SDMMC_WRAPPER_READ  0x17FCF0
-#define FS_OFFSET_1500_SDMMC_WRAPPER_WRITE 0x17FD50
-#define FS_OFFSET_1500_RTLD                0x26518
-#define FS_OFFSET_1500_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x3C)))
-
-#define FS_OFFSET_1500_CLKRST_SET_MIN_V_CLK_RATE 0x1A0870
-
-// Misc funcs
-#define FS_OFFSET_1500_LOCK_MUTEX          0x1791A0
-#define FS_OFFSET_1500_UNLOCK_MUTEX        0x1791F0
-
-#define FS_OFFSET_1500_SDMMC_WRAPPER_CONTROLLER_OPEN  0x17FCB0
-#define FS_OFFSET_1500_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x17FCD0
-
-// Misc Data
-#define FS_OFFSET_1500_SD_MUTEX            0xFF33F0
-#define FS_OFFSET_1500_NAND_MUTEX          0xFEE2E8
-#define FS_OFFSET_1500_ACTIVE_PARTITION    0xFEE328
-#define FS_OFFSET_1500_SDMMC_DAS_HANDLE    0xFD38D8
-
-// NOPs
-#define FS_OFFSET_1500_SD_DAS_INIT         0x25454
-
-// Nintendo Paths
-#define FS_OFFSET_1500_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x00063050, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x0006FDE8, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x000768D4, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00089364, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1500_H__

emummc/source/FS/offsets/1500_exfat.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef __FS_1500_EXFAT_H__
-#define __FS_1500_EXFAT_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1500_EXFAT_SDMMC_ACCESSOR_GC   0x18EDB0
-#define FS_OFFSET_1500_EXFAT_SDMMC_ACCESSOR_SD   0x190A30
-#define FS_OFFSET_1500_EXFAT_SDMMC_ACCESSOR_NAND 0x18F270
-
-// Hooks
-#define FS_OFFSET_1500_EXFAT_SDMMC_WRAPPER_READ  0x18AC80
-#define FS_OFFSET_1500_EXFAT_SDMMC_WRAPPER_WRITE 0x18ACE0
-#define FS_OFFSET_1500_EXFAT_RTLD                0x26518
-#define FS_OFFSET_1500_EXFAT_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x3C)))
-
-#define FS_OFFSET_1500_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x1AB800
-
-// Misc funcs
-#define FS_OFFSET_1500_EXFAT_LOCK_MUTEX          0x184130
-#define FS_OFFSET_1500_EXFAT_UNLOCK_MUTEX        0x184180
-
-#define FS_OFFSET_1500_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0x18AC40
-#define FS_OFFSET_1500_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x18AC60
-
-// Misc Data
-#define FS_OFFSET_1500_EXFAT_SD_MUTEX            0x10053F0
-#define FS_OFFSET_1500_EXFAT_NAND_MUTEX          0x10002E8
-#define FS_OFFSET_1500_EXFAT_ACTIVE_PARTITION    0x1000328
-#define FS_OFFSET_1500_EXFAT_SDMMC_DAS_HANDLE    0xFE08D8
-
-// NOPs
-#define FS_OFFSET_1500_EXFAT_SD_DAS_INIT         0x25454
-
-// Nintendo Paths
-#define FS_OFFSET_1500_EXFAT_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x00063050, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x0006FDE8, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x000768D4, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00089364, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1500_EXFAT_H__

emummc/source/FS/offsets/1600.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef __FS_1600_H__
-#define __FS_1600_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1600_SDMMC_ACCESSOR_GC   0x1862A0
-#define FS_OFFSET_1600_SDMMC_ACCESSOR_SD   0x187F20
-#define FS_OFFSET_1600_SDMMC_ACCESSOR_NAND 0x186760
-
-// Hooks
-#define FS_OFFSET_1600_SDMMC_WRAPPER_READ  0x1821F0
-#define FS_OFFSET_1600_SDMMC_WRAPPER_WRITE 0x182250
-#define FS_OFFSET_1600_RTLD                0x269B0
-#define FS_OFFSET_1600_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x3C)))
-
-#define FS_OFFSET_1600_CLKRST_SET_MIN_V_CLK_RATE 0x1A2D30
-
-// Misc funcs
-#define FS_OFFSET_1600_LOCK_MUTEX          0x17B730
-#define FS_OFFSET_1600_UNLOCK_MUTEX        0x17B780
-
-#define FS_OFFSET_1600_SDMMC_WRAPPER_CONTROLLER_OPEN  0x1821B0
-#define FS_OFFSET_1600_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1821D0
-
-// Misc Data
-#define FS_OFFSET_1600_SD_MUTEX            0xFFB3F0
-#define FS_OFFSET_1600_NAND_MUTEX          0xFF6B58
-#define FS_OFFSET_1600_ACTIVE_PARTITION    0xFF6B98
-#define FS_OFFSET_1600_SDMMC_DAS_HANDLE    0xFDC8B0
-
-// NOPs
-#define FS_OFFSET_1600_SD_DAS_INIT         0x258D4
-
-// Nintendo Paths
-#define FS_OFFSET_1600_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x00063B48, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x00070D6C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0007790C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0008A754, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1600_H__

emummc/source/FS/offsets/1600_exfat.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef __FS_1600_EXFAT_H__
-#define __FS_1600_EXFAT_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_1600_EXFAT_SDMMC_ACCESSOR_GC   0x190F80
-#define FS_OFFSET_1600_EXFAT_SDMMC_ACCESSOR_SD   0x192C00
-#define FS_OFFSET_1600_EXFAT_SDMMC_ACCESSOR_NAND 0x191440
-
-// Hooks
-#define FS_OFFSET_1600_EXFAT_SDMMC_WRAPPER_READ  0x18CED0
-#define FS_OFFSET_1600_EXFAT_SDMMC_WRAPPER_WRITE 0x18CF30
-#define FS_OFFSET_1600_EXFAT_RTLD                0x269B0
-#define FS_OFFSET_1600_EXFAT_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x3C)))
-
-#define FS_OFFSET_1600_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x1ADA10
-
-// Misc funcs
-#define FS_OFFSET_1600_EXFAT_LOCK_MUTEX          0x186410
-#define FS_OFFSET_1600_EXFAT_UNLOCK_MUTEX        0x186460
-
-#define FS_OFFSET_1600_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0x18CE90
-#define FS_OFFSET_1600_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x18CEB0
-
-// Misc Data
-#define FS_OFFSET_1600_EXFAT_SD_MUTEX            0x100D3F0
-#define FS_OFFSET_1600_EXFAT_NAND_MUTEX          0x1008B58
-#define FS_OFFSET_1600_EXFAT_ACTIVE_PARTITION    0x1008B98
-#define FS_OFFSET_1600_EXFAT_SDMMC_DAS_HANDLE    0xFE98B0
-
-// NOPs
-#define FS_OFFSET_1600_EXFAT_SD_DAS_INIT         0x258D4
-
-// Nintendo Paths
-#define FS_OFFSET_1600_EXFAT_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x00063B48, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x00070D6C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0007790C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0008A754, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_1600_EXFAT_H__

emummc/source/nx/cache.s

@@ -27,10 +27,6 @@ CODE_BEGIN armDCacheFlush
 	bic x8, x0, x10
 	mov x10, x1
 
-	mov w1, #1
-	mrs x0, tpidrro_el0
-	strb w1, [x0, #0x104]
-
 armDCacheFlush_L0:
 	dc  civac, x8
 	add x8, x8, x9
@@ -38,9 +34,6 @@ armDCacheFlush_L0:
 	bcc armDCacheFlush_L0
 
 	dsb sy
-
-	strb wzr, [x0, #0x104]
-
 	ret
 CODE_END
 
@@ -55,10 +48,6 @@ CODE_BEGIN armDCacheClean
 	bic x8, x0, x10
 	mov x10, x1
 
-	mov w1, #1
-	mrs x0, tpidrro_el0
-	strb w1, [x0, #0x104]
-
 armDCacheClean_L0:
 	dc  cvac, x8
 	add x8, x8, x9
@@ -66,9 +55,6 @@ armDCacheClean_L0:
 	bcc armDCacheClean_L0
 
 	dsb sy
-
-	strb wzr, [x0, #0x104]
-
 	ret
 CODE_END
 
@@ -82,10 +68,6 @@ CODE_BEGIN armICacheInvalidate
 	bic x8, x0, x10
 	mov x10, x1
 
-	mov w1, #1
-	mrs x0, tpidrro_el0
-	strb w1, [x0, #0x104]
-
 armICacheInvalidate_L0:
 	ic  ivau, x8
 	add x8, x8, x9
@@ -93,9 +75,6 @@ armICacheInvalidate_L0:
 	bcc armICacheInvalidate_L0
 
 	dsb sy
-
-	strb wzr, [x0, #0x104]
-
 	ret
 CODE_END
 
@@ -110,10 +89,6 @@ CODE_BEGIN armDCacheZero
 	bic x8, x0, x10
 	mov x10, x1
 
-	mov w1, #1
-	mrs x0, tpidrro_el0
-	strb w1, [x0, #0x104]
-
 armDCacheZero_L0:
 	dc  zva, x8
 	add x8, x8, x9
@@ -121,8 +96,5 @@ armDCacheZero_L0:
 	bcc armDCacheZero_L0
 
 	dsb sy
-
-	strb wzr, [x0, #0x104]
-
 	ret
 CODE_END

exosphere/mariko_fatal/source/fatal_save_context.cpp

@@ -62,7 +62,7 @@ namespace ams::secmon::fatal {
         /* Write the context to the file. */
         R_TRY(fs::WriteFile(file, 0, ctx, sizeof(*ctx), fs::WriteOption::Flush));
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
 }

exosphere/mariko_fatal/source/fatal_sdmmc.cpp

@@ -48,11 +48,11 @@ namespace ams::secmon::fatal {
         //sdmmc::Deactivate(Port);
         R_TRY(sdmmc::Activate(Port));
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     Result CheckSdCardConnection(sdmmc::SpeedMode *out_sm, sdmmc::BusWidth *out_bw) {
-        R_RETURN(sdmmc::CheckSdCardConnection(out_sm, out_bw, Port));
+        return sdmmc::CheckSdCardConnection(out_sm, out_bw, Port);
     }
 
     Result ReadSdCard(void *dst, size_t size, size_t sector_index, size_t sector_count) {
@@ -78,7 +78,7 @@ namespace ams::secmon::fatal {
             sector_count -= cur_sectors;
         }
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     Result WriteSdCard(size_t sector_index, size_t sector_count, const void *src, size_t size) {
@@ -104,7 +104,7 @@ namespace ams::secmon::fatal {
             sector_count -= cur_sectors;
         }
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
 }

exosphere/mariko_fatal/source/fs/fatal_fs_api.cpp

@@ -34,45 +34,45 @@ namespace ams::fs {
         Result TranslateFatFsError(FRESULT res) {
             switch (res) {
                 case FR_OK:
-                    R_SUCCEED();
+                    return ResultSuccess();
                 case FR_DISK_ERR:
-                    R_THROW(fs::ResultMmcAccessFailed());
+                    return fs::ResultMmcAccessFailed();
                 case FR_INT_ERR:
-                    R_THROW(fs::ResultPreconditionViolation());
+                    return fs::ResultPreconditionViolation();
                 case FR_NOT_READY:
-                    R_THROW(fs::ResultMmcAccessFailed());
+                    return fs::ResultMmcAccessFailed();
                 case FR_NO_FILE:
-                    R_THROW(fs::ResultPathNotFound());
+                    return fs::ResultPathNotFound();
                 case FR_NO_PATH:
-                    R_THROW(fs::ResultPathNotFound());
+                    return fs::ResultPathNotFound();
                 case FR_INVALID_NAME:
-                    R_THROW(fs::ResultInvalidPath());
+                    return fs::ResultInvalidPath();
                 case FR_DENIED:
-                    R_THROW(fs::ResultPermissionDenied());
+                    return fs::ResultPermissionDenied();
                 case FR_EXIST:
-                    R_THROW(fs::ResultPathAlreadyExists());
+                    return fs::ResultPathAlreadyExists();
                 case FR_INVALID_OBJECT:
-                    R_THROW(fs::ResultInvalidArgument());
+                    return fs::ResultInvalidArgument();
                 case FR_WRITE_PROTECTED:
-                    R_THROW(fs::ResultWriteNotPermitted());
+                    return fs::ResultWriteNotPermitted();
                 case FR_INVALID_DRIVE:
-                    R_THROW(fs::ResultInvalidMountName());
+                    return fs::ResultInvalidMountName();
                 case FR_NOT_ENABLED:
-                    R_THROW(fs::ResultInvalidMountName()); /* BAD/TODO */
+                    return fs::ResultInvalidMountName(); /* BAD/TODO */
                 case FR_NO_FILESYSTEM:
-                    R_THROW(fs::ResultInvalidMountName()); /* BAD/TODO */
+                    return fs::ResultInvalidMountName(); /* BAD/TODO */
                 case FR_TIMEOUT:
-                    R_THROW(fs::ResultTargetLocked()); /* BAD/TODO */
+                    return fs::ResultTargetLocked(); /* BAD/TODO */
                 case FR_LOCKED:
-                    R_THROW(fs::ResultTargetLocked());
+                    return fs::ResultTargetLocked();
                 case FR_NOT_ENOUGH_CORE:
-                    R_THROW(fs::ResultPreconditionViolation()); /* BAD/TODO */
+                    return fs::ResultPreconditionViolation(); /* BAD/TODO */
                 case FR_TOO_MANY_OPEN_FILES:
-                    R_THROW(fs::ResultPreconditionViolation()); /* BAD/TODO */
+                    return fs::ResultPreconditionViolation(); /* BAD/TODO */
                 case FR_INVALID_PARAMETER:
-                    R_THROW(fs::ResultInvalidArgument());
+                    return fs::ResultInvalidArgument();
                 default:
-                    R_THROW(fs::ResultInternal());
+                    return fs::ResultInternal();
             }
         }
 
@@ -125,11 +125,11 @@ namespace ams::fs {
         /* Expand the file. */
         R_TRY(TranslateFatFsError(f_expand(std::addressof(fp), size, 1)));
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     Result CreateDirectory(const char *path) {
-        R_RETURN(TranslateFatFsError(f_mkdir(path)));
+        return TranslateFatFsError(f_mkdir(path));
     }
 
     Result OpenFile(FileHandle *out_file, const char *path, int mode) {
@@ -144,10 +144,10 @@ namespace ams::fs {
                 out_file->_handle = fp;
                 g_files_opened[i] = true;
                 g_open_modes[i] = mode;
-                R_SUCCEED();
+                return ResultSuccess();
             }
         }
-        R_THROW(fs::ResultOpenCountLimit());
+        return fs::ResultOpenCountLimit();
     }
 
     Result ReadFile(FileHandle handle, s64 offset, void *buffer, size_t size, const fs::ReadOption &option) {
@@ -164,11 +164,11 @@ namespace ams::fs {
         /* Check that we read the correct amount. */
         R_UNLESS(br == size, fs::ResultOutOfRange());
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     Result ReadFile(FileHandle handle, s64 offset, void *buffer, size_t size) {
-        R_RETURN(ReadFile(handle, offset, buffer, size, fs::ReadOption::None));
+        return ReadFile(handle, offset, buffer, size, fs::ReadOption::None);
     }
 
     Result ReadFile(size_t *out, FileHandle handle, s64 offset, void *buffer, size_t size, const fs::ReadOption &option) {
@@ -185,21 +185,21 @@ namespace ams::fs {
         /* Set the output size. */
         *out = br;
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     Result ReadFile(size_t *out, FileHandle handle, s64 offset, void *buffer, size_t size) {
-        R_RETURN(ReadFile(out, handle, offset, buffer, size, fs::ReadOption::None));
+        return ReadFile(out, handle, offset, buffer, size, fs::ReadOption::None);
     }
 
     Result GetFileSize(s64 *out, FileHandle handle) {
         FIL *fp = GetInternalFile(handle);
         *out = f_size(fp);
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     Result FlushFile(FileHandle handle) {
-        R_RETURN(TranslateFatFsError(f_sync(GetInternalFile(handle))));
+        return TranslateFatFsError(f_sync(GetInternalFile(handle)));
     }
 
     Result WriteFile(FileHandle handle, s64 offset, const void *buffer, size_t size, const fs::WriteOption &option) {
@@ -218,7 +218,7 @@ namespace ams::fs {
             R_TRY(FlushFile(handle));
         }
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     Result SetFileSize(FileHandle handle, s64 size) {
@@ -242,7 +242,7 @@ namespace ams::fs {
         /* Check that our expansion succeeded. */
         AMS_ASSERT(f_size(fp) == static_cast<FSIZE_t>(size));
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     int GetFileOpenMode(FileHandle handle) {

exosphere/program/source/boot/secmon_boot_key_data.s

@@ -85,10 +85,10 @@ _ZN3ams6secmon4boot15VolatileKeyDataE:
 /* We can get away with only including latest because exosphere supports newer-than-expected master key in engine. */
 /* TODO: Update on next change of keys. */
 /* Mariko Development Master Kek Source. */
-.byte 0x3A, 0x9C, 0xF0, 0x39, 0x70, 0x23, 0xF6, 0xAF, 0x71, 0x44, 0x60, 0xF4, 0x6D, 0xED, 0xA1, 0xD6
+.byte 0xEC, 0x5E, 0xB5, 0x11, 0xD5, 0x43, 0x1E, 0x6A, 0x4E, 0x54, 0x6F, 0xD4, 0xD3, 0x22, 0xCE, 0x87
 
 /* Mariko Production Master Kek Source. */
-.byte 0xA5, 0xEC, 0x16, 0x39, 0x1A, 0x30, 0x16, 0x08, 0x2E, 0xCF, 0x09, 0x6F, 0x5E, 0x7C, 0xEE, 0xA9
+.byte 0xD2, 0x68, 0xC6, 0x53, 0x9D, 0x94, 0xF9, 0xA8, 0xA5, 0xA8, 0xA7, 0xC8, 0x8F, 0x53, 0x4B, 0x7A
 
 /* Development Master Key Vectors. */
 .byte 0x46, 0x22, 0xB4, 0x51, 0x9A, 0x7E, 0xA7, 0x7F, 0x62, 0xA1, 0x1F, 0x8F, 0xC5, 0x3A, 0xDB, 0xFE /* Zeroes encrypted with Master Key 00. */
@@ -105,8 +105,6 @@ _ZN3ams6secmon4boot15VolatileKeyDataE:
 .byte 0x21, 0x88, 0x6B, 0x10, 0x9E, 0x83, 0xD6, 0x52, 0xAB, 0x08, 0xDB, 0x6D, 0x39, 0xFF, 0x1C, 0x9C /* Master key 0A encrypted with Master key 0B. */
 .byte 0x8A, 0xCE, 0xC4, 0x7F, 0xBE, 0x08, 0x61, 0x88, 0xD3, 0x73, 0x64, 0x51, 0xE2, 0xB6, 0x53, 0x15 /* Master key 0B encrypted with Master key 0C. */
 .byte 0x08, 0xE0, 0xF4, 0xBE, 0xAA, 0x6E, 0x5A, 0xC3, 0xA6, 0xBC, 0xFE, 0xB9, 0xE2, 0xA3, 0x24, 0x12 /* Master key 0C encrypted with Master key 0D. */
-.byte 0xD6, 0x80, 0x98, 0xC0, 0xFA, 0xC7, 0x13, 0xCB, 0x93, 0xD2, 0x0B, 0x82, 0x4C, 0xA1, 0x7B, 0x8D /* Master key 0D encrypted with Master key 0E. */
-.byte 0x78, 0x66, 0x19, 0xBD, 0x86, 0xE7, 0xC1, 0x09, 0x9B, 0x6F, 0x92, 0xB2, 0x58, 0x7D, 0xCF, 0x26 /* Master key 0E encrypted with Master key 0F. */
 
 /* Production Master Key Vectors. */
 .byte 0x0C, 0xF0, 0x59, 0xAC, 0x85, 0xF6, 0x26, 0x65, 0xE1, 0xE9, 0x19, 0x55, 0xE6, 0xF2, 0x67, 0x3D /* Zeroes encrypted with Master Key 00. */
@@ -123,8 +121,6 @@ _ZN3ams6secmon4boot15VolatileKeyDataE:
 .byte 0xC1, 0x8D, 0x16, 0xBB, 0x2A, 0xE4, 0x1D, 0xD4, 0xC2, 0xC1, 0xB6, 0x40, 0x94, 0x35, 0x63, 0x98 /* Master key 0A encrypted with Master key 0B. */
 .byte 0xA3, 0x24, 0x65, 0x75, 0xEA, 0xCC, 0x6E, 0x8D, 0xFB, 0x5A, 0x16, 0x50, 0x74, 0xD2, 0x15, 0x06 /* Master key 0B encrypted with Master key 0C. */
 .byte 0x83, 0x67, 0xAF, 0x01, 0xCF, 0x93, 0xA1, 0xAB, 0x80, 0x45, 0xF7, 0x3F, 0x72, 0xFD, 0x3B, 0x38 /* Master key 0C encrypted with Master key 0D. */
-.byte 0xB1, 0x81, 0xA6, 0x0D, 0x72, 0xC7, 0xEE, 0x15, 0x21, 0xF3, 0xC0, 0xB5, 0x6B, 0x61, 0x6D, 0xE7 /* Master key 0D encrypted with Master key 0E. */
-.byte 0xAF, 0x11, 0x4C, 0x67, 0x17, 0x7A, 0x52, 0x43, 0xF7, 0x70, 0x2F, 0xC7, 0xEF, 0x81, 0x72, 0x16 /* Master key 0E encrypted with Master key 0F. */
 
 /* Device Master Key Source Sources. */
 .byte 0x8B, 0x4E, 0x1C, 0x22, 0x42, 0x07, 0xC8, 0x73, 0x56, 0x94, 0x08, 0x8B, 0xCC, 0x47, 0x0F, 0x5D /* 4.0.0  Device Master Key Source Source. */
@@ -138,8 +134,6 @@ _ZN3ams6secmon4boot15VolatileKeyDataE:
 .byte 0xAA, 0xFD, 0xBC, 0xBB, 0x25, 0xC3, 0xA4, 0xEF, 0xE3, 0xEE, 0x58, 0x53, 0xB7, 0xF8, 0xDD, 0xD6 /* 12.1.0 Device Master Key Source Source. */
 .byte 0xE4, 0xF3, 0x45, 0x6F, 0x18, 0xA1, 0x89, 0xF8, 0xDA, 0x4C, 0x64, 0x75, 0x68, 0xE6, 0xBD, 0x4F /* 13.0.0 Device Master Key Source Source. */
 .byte 0x5B, 0x94, 0x63, 0xF7, 0xAD, 0x96, 0x1B, 0xA6, 0x23, 0x30, 0x06, 0x4D, 0x01, 0xE4, 0xCE, 0x1D /* 14.0.0 Device Master Key Source Source. */
-.byte 0x5E, 0xC9, 0xC5, 0x0A, 0xD0, 0x5F, 0x8B, 0x7B, 0xA7, 0x39, 0xEA, 0xBC, 0x60, 0x0F, 0x74, 0xE6 /* 15.0.0 Device Master Key Source Source. */
-.byte 0xEA, 0x90, 0x6E, 0xA8, 0xAE, 0x92, 0x99, 0x64, 0x36, 0xC1, 0xF3, 0x1C, 0xC6, 0x32, 0x83, 0x8C /* 16.0.0 Device Master Key Source Source. */
 
 /* Development Device Master Kek Sources. */
 .byte 0xD6, 0xBD, 0x9F, 0xC6, 0x18, 0x09, 0xE1, 0x96, 0x20, 0x39, 0x60, 0xD2, 0x89, 0x83, 0x31, 0x34 /* 4.0.0  Device Master Kek Source. */
@@ -153,8 +147,6 @@ _ZN3ams6secmon4boot15VolatileKeyDataE:
 .byte 0xC4, 0xBB, 0xF3, 0x9F, 0xA3, 0xAA, 0x00, 0x99, 0x7C, 0x97, 0xAD, 0x91, 0x8F, 0xE8, 0x45, 0xCB /* 12.1.0 Device Master Kek Source. */
 .byte 0x20, 0x20, 0xAA, 0xFB, 0x89, 0xC2, 0xF0, 0x70, 0xB5, 0xE0, 0xA3, 0x11, 0x8A, 0x29, 0x8D, 0x0F /* 13.0.0 Device Master Kek Source. */
 .byte 0xCE, 0x14, 0x74, 0x66, 0x98, 0xA8, 0x6D, 0x7D, 0xBD, 0x54, 0x91, 0x68, 0x5F, 0x1D, 0x0E, 0xEA /* 14.0.0 Device Master Kek Source. */
-.byte 0xAE, 0x05, 0x48, 0x65, 0xAB, 0x17, 0x9D, 0x3D, 0x51, 0xB7, 0x56, 0xBD, 0x9B, 0x0B, 0x5B, 0x6E /* 15.0.0 Device Master Kek Source. */
-.byte 0xFF, 0xF6, 0x4B, 0x0F, 0xFF, 0x0D, 0xC0, 0x4F, 0x56, 0x8A, 0x40, 0x74, 0x67, 0xC5, 0xFE, 0x9F /* 16.0.0 Device Master Kek Source. */
 
 /* Production Device Master Kek Sources. */
 .byte 0x88, 0x62, 0x34, 0x6E, 0xFA, 0xF7, 0xD8, 0x3F, 0xE1, 0x30, 0x39, 0x50, 0xF0, 0xB7, 0x5D, 0x5D /* 4.0.0  Device Master Kek Source. */
@@ -168,5 +160,3 @@ _ZN3ams6secmon4boot15VolatileKeyDataE:
 .byte 0xC2, 0x65, 0x34, 0x6E, 0xC7, 0xC6, 0x5D, 0x97, 0x3E, 0x34, 0x5C, 0x6B, 0xB3, 0x7E, 0xC6, 0xE3 /* 12.1.0 Device Master Kek Source. */
 .byte 0x77, 0x52, 0x92, 0xF0, 0xAA, 0xE3, 0xFB, 0xE0, 0x60, 0x16, 0xB3, 0x78, 0x68, 0x53, 0xF7, 0xA8 /* 13.0.0 Device Master Kek Source. */
 .byte 0x67, 0xD5, 0xD6, 0x0C, 0x08, 0xF5, 0xA3, 0x11, 0xBD, 0x6D, 0x5A, 0xEB, 0x96, 0x24, 0xB0, 0xD2 /* 14.0.0 Device Master Kek Source. */
-.byte 0x7C, 0x30, 0xED, 0x8B, 0x39, 0x25, 0x2C, 0x08, 0x8F, 0x48, 0xDC, 0x28, 0xE6, 0x1A, 0x6B, 0x49 /* 15.0.0 Device Master Kek Source. */
-.byte 0xF0, 0xF3, 0xFF, 0x52, 0x75, 0x2F, 0xBA, 0x4D, 0x09, 0x72, 0x30, 0x89, 0xA9, 0xDF, 0xFE, 0x1F /* 16.0.0 Device Master Kek Source. */

exosphere/program/source/boot/secmon_package2.cpp

@@ -94,7 +94,7 @@ namespace ams::secmon::boot {
         }
 
         /* Check that the key generation is one that we can use. */
-        static_assert(pkg1::KeyGeneration_Count == 16);
+        static_assert(pkg1::KeyGeneration_Count == 14);
         if (key_generation >= pkg1::KeyGeneration_Count) {
             return false;
         }

exosphere/program/source/smc/secmon_smc_info.cpp

@@ -52,7 +52,7 @@ namespace ams::secmon::smc {
             [fuse::DramId_IcosaSamsung6GB]    = pkg1::MemorySize_6GB,
             [fuse::DramId_HoagHynix1y4GB]     = pkg1::MemorySize_4GB,
             [fuse::DramId_AulaHynix1y4GB]     = pkg1::MemorySize_4GB,
-            [fuse::DramId_Deprecated7]        = pkg1::MemorySize_4GB,
+            [fuse::DramId_IowaX1X2Samsung4GB] = pkg1::MemorySize_4GB,
             [fuse::DramId_IowaSansung4GB]     = pkg1::MemorySize_4GB,
             [fuse::DramId_IowaSamsung8GB]     = pkg1::MemorySize_8GB,
             [fuse::DramId_IowaHynix4GB]       = pkg1::MemorySize_4GB,
@@ -61,7 +61,7 @@ namespace ams::secmon::smc {
             [fuse::DramId_HoagSamsung8GB]     = pkg1::MemorySize_8GB,
             [fuse::DramId_HoagHynix4GB]       = pkg1::MemorySize_4GB,
             [fuse::DramId_HoagMicron4GB]      = pkg1::MemorySize_4GB,
-            [fuse::DramId_Deprecated16]       = pkg1::MemorySize_4GB,
+            [fuse::DramId_IowaSamsung4GBY]    = pkg1::MemorySize_4GB,
             [fuse::DramId_IowaSamsung1y4GBX]  = pkg1::MemorySize_4GB,
             [fuse::DramId_IowaSamsung1y8GBX]  = pkg1::MemorySize_8GB,
             [fuse::DramId_HoagSamsung1y4GBX]  = pkg1::MemorySize_4GB,
@@ -74,12 +74,6 @@ namespace ams::secmon::smc {
             [fuse::DramId_HoagMicron1y4GB]    = pkg1::MemorySize_4GB,
             [fuse::DramId_AulaMicron1y4GB]    = pkg1::MemorySize_4GB,
             [fuse::DramId_AulaSamsung1y8GBX]  = pkg1::MemorySize_8GB,
-            [fuse::DramId_IowaX1X2Samsung4GB] = pkg1::MemorySize_4GB,
-            [fuse::DramId_HoagX1X2Samsung4GB] = pkg1::MemorySize_4GB,
-            [fuse::DramId_AulaX1X2Samsung4GB] = pkg1::MemorySize_4GB,
-            [fuse::DramId_IowaSamsung4GBY]    = pkg1::MemorySize_4GB,
-            [fuse::DramId_HoagSamsung4GBY]    = pkg1::MemorySize_4GB,
-            [fuse::DramId_AulaSamsung4GBY]    = pkg1::MemorySize_4GB,
         };
 
         constexpr const pkg1::MemoryMode MemoryModes[] = {

fusee/program/source/fs/fusee_fs_api.cpp

@@ -39,45 +39,45 @@ namespace ams::fs {
         Result TranslateFatFsError(FRESULT res) {
             switch (res) {
                 case FR_OK:
-                    R_SUCCEED();
+                    return ResultSuccess();
                 case FR_DISK_ERR:
-                    R_THROW(fs::ResultMmcAccessFailed());
+                    return fs::ResultMmcAccessFailed();
                 case FR_INT_ERR:
-                    R_THROW(fs::ResultPreconditionViolation());
+                    return fs::ResultPreconditionViolation();
                 case FR_NOT_READY:
-                    R_THROW(fs::ResultMmcAccessFailed());
+                    return fs::ResultMmcAccessFailed();
                 case FR_NO_FILE:
-                    R_THROW(fs::ResultPathNotFound());
+                    return fs::ResultPathNotFound();
                 case FR_NO_PATH:
-                    R_THROW(fs::ResultPathNotFound());
+                    return fs::ResultPathNotFound();
                 case FR_INVALID_NAME:
-                    R_THROW(fs::ResultInvalidPath());
+                    return fs::ResultInvalidPath();
                 case FR_DENIED:
-                    R_THROW(fs::ResultPermissionDenied());
+                    return fs::ResultPermissionDenied();
                 case FR_EXIST:
-                    R_THROW(fs::ResultPathAlreadyExists());
+                    return fs::ResultPathAlreadyExists();
                 case FR_INVALID_OBJECT:
-                    R_THROW(fs::ResultInvalidArgument());
+                    return fs::ResultInvalidArgument();
                 case FR_WRITE_PROTECTED:
-                    R_THROW(fs::ResultWriteNotPermitted());
+                    return fs::ResultWriteNotPermitted();
                 case FR_INVALID_DRIVE:
-                    R_THROW(fs::ResultInvalidMountName());
+                    return fs::ResultInvalidMountName();
                 case FR_NOT_ENABLED:
-                    R_THROW(fs::ResultInvalidMountName()); /* BAD/TODO */
+                    return fs::ResultInvalidMountName(); /* BAD/TODO */
                 case FR_NO_FILESYSTEM:
-                    R_THROW(fs::ResultInvalidMountName()); /* BAD/TODO */
+                    return fs::ResultInvalidMountName(); /* BAD/TODO */
                 case FR_TIMEOUT:
-                    R_THROW(fs::ResultTargetLocked()); /* BAD/TODO */
+                    return fs::ResultTargetLocked(); /* BAD/TODO */
                 case FR_LOCKED:
-                    R_THROW(fs::ResultTargetLocked());
+                    return fs::ResultTargetLocked();
                 case FR_NOT_ENOUGH_CORE:
-                    R_THROW(fs::ResultPreconditionViolation()); /* BAD/TODO */
+                    return fs::ResultPreconditionViolation(); /* BAD/TODO */
                 case FR_TOO_MANY_OPEN_FILES:
-                    R_THROW(fs::ResultPreconditionViolation()); /* BAD/TODO */
+                    return fs::ResultPreconditionViolation(); /* BAD/TODO */
                 case FR_INVALID_PARAMETER:
-                    R_THROW(fs::ResultInvalidArgument());
+                    return fs::ResultInvalidArgument();
                 default:
-                    R_THROW(fs::ResultInternal());
+                    return fs::ResultInternal();
             }
         }
 
@@ -138,7 +138,7 @@ namespace ams::fs {
         *out_entry_type = (info.fattrib & AM_DIR) ? DirectoryEntryType_Directory : DirectoryEntryType_File;
         *out_archive    = (info.fattrib & AM_ARC);
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     Result CreateFile(const char *path, s64 size) {
@@ -152,11 +152,11 @@ namespace ams::fs {
         /* Expand the file. */
         R_TRY(TranslateFatFsError(f_expand(std::addressof(fp), size, 1)));
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     Result CreateDirectory(const char *path) {
-        R_RETURN(TranslateFatFsError(f_mkdir(path)));
+        return TranslateFatFsError(f_mkdir(path));
     }
 
     Result OpenFile(FileHandle *out_file, const char *path, int mode) {
@@ -171,10 +171,10 @@ namespace ams::fs {
                 out_file->_handle = fp;
                 g_files_opened[i] = true;
                 g_open_modes[i] = mode;
-                R_SUCCEED();
+                return ResultSuccess();
             }
         }
-        R_THROW(fs::ResultOpenCountLimit());
+        return fs::ResultOpenCountLimit();
     }
 
     Result OpenDirectory(DirectoryHandle *out_dir, const char *path) {
@@ -188,10 +188,10 @@ namespace ams::fs {
                 /* Set the output. */
                 out_dir->_handle = dp;
                 g_dirs_opened[i] = true;
-                R_SUCCEED();
+                return ResultSuccess();
             }
         }
-        R_THROW(fs::ResultOpenCountLimit());
+        return fs::ResultOpenCountLimit();
     }
 
     Result ReadDirectory(s64 *out_count, DirectoryEntry *out_entries, DirectoryHandle handle, s64 max_entries) {
@@ -209,7 +209,7 @@ namespace ams::fs {
         }
 
         *out_count = count;
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     void CloseDirectory(DirectoryHandle handle) {
@@ -232,11 +232,11 @@ namespace ams::fs {
         /* Check that we read the correct amount. */
         R_UNLESS(br == size, fs::ResultOutOfRange());
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     Result ReadFile(FileHandle handle, s64 offset, void *buffer, size_t size) {
-        R_RETURN(ReadFile(handle, offset, buffer, size, fs::ReadOption::None));
+        return ReadFile(handle, offset, buffer, size, fs::ReadOption::None);
     }
 
     Result ReadFile(size_t *out, FileHandle handle, s64 offset, void *buffer, size_t size, const fs::ReadOption &option) {
@@ -253,21 +253,21 @@ namespace ams::fs {
         /* Set the output size. */
         *out = br;
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     Result ReadFile(size_t *out, FileHandle handle, s64 offset, void *buffer, size_t size) {
-        R_RETURN(ReadFile(out, handle, offset, buffer, size, fs::ReadOption::None));
+        return ReadFile(out, handle, offset, buffer, size, fs::ReadOption::None);
     }
 
     Result GetFileSize(s64 *out, FileHandle handle) {
         FIL *fp = GetInternalFile(handle);
         *out = f_size(fp);
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     Result FlushFile(FileHandle handle) {
-        R_RETURN(TranslateFatFsError(f_sync(GetInternalFile(handle))));
+        return TranslateFatFsError(f_sync(GetInternalFile(handle)));
     }
 
     Result WriteFile(FileHandle handle, s64 offset, const void *buffer, size_t size, const fs::WriteOption &option) {
@@ -286,7 +286,7 @@ namespace ams::fs {
             R_TRY(FlushFile(handle));
         }
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     Result SetFileSize(FileHandle handle, s64 size) {
@@ -310,7 +310,7 @@ namespace ams::fs {
         /* Check that our expansion succeeded. */
         AMS_ASSERT(f_size(fp) == static_cast<FSIZE_t>(size));
 
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     int GetFileOpenMode(FileHandle handle) {

fusee/program/source/fs/fusee_fs_file_storage.cpp

@@ -20,7 +20,7 @@ namespace ams::fs {
 
     Result FileHandleStorage::UpdateSize() {
         R_SUCCEED_IF(m_size != InvalidSize);
-        R_RETURN(GetFileSize(std::addressof(m_size), m_handle));
+        return GetFileSize(std::addressof(m_size), m_handle);
     }
 
     Result FileHandleStorage::Read(s64 offset, void *buffer, size_t size) {
@@ -34,9 +34,9 @@ namespace ams::fs {
         R_TRY(this->UpdateSize());
 
         /* Ensure our access is valid. */
-        R_TRY(IStorage::CheckAccessRange(offset, size, m_size));
+        R_UNLESS(IStorage::CheckAccessRange(offset, size, m_size), fs::ResultOutOfRange());
 
-        R_RETURN(ReadFile(m_handle, offset, buffer, size, fs::ReadOption()));
+        return ReadFile(m_handle, offset, buffer, size, fs::ReadOption());
     }
 
     Result FileHandleStorage::Write(s64 offset, const void *buffer, size_t size) {
@@ -50,24 +50,24 @@ namespace ams::fs {
         R_TRY(this->UpdateSize());
 
         /* Ensure our access is valid. */
-        R_TRY(IStorage::CheckAccessRange(offset, size, m_size));
+        R_UNLESS(IStorage::CheckAccessRange(offset, size, m_size), fs::ResultOutOfRange());
 
-        R_RETURN(WriteFile(m_handle, offset, buffer, size, fs::WriteOption()));
+        return WriteFile(m_handle, offset, buffer, size, fs::WriteOption());
     }
 
     Result FileHandleStorage::Flush() {
-        R_RETURN(FlushFile(m_handle));
+        return FlushFile(m_handle);
     }
 
     Result FileHandleStorage::GetSize(s64 *out_size) {
         R_TRY(this->UpdateSize());
         *out_size = m_size;
-        R_SUCCEED();
+        return ResultSuccess();
     }
 
     Result FileHandleStorage::SetSize(s64 size) {
         m_size = InvalidSize;
-        R_RETURN(SetFileSize(m_handle, size));
+        return SetFileSize(m_handle, size);
     }
 
 }

fusee/program/source/fs/fusee_fs_storage.hpp

@@ -31,38 +31,25 @@ namespace ams::fs {
 
             virtual Result GetSize(s64 *out) = 0;
         public:
-            static inline Result CheckAccessRange(s64 offset, s64 size, s64 total_size) {
-                R_UNLESS(offset >= 0,                                    fs::ResultInvalidOffset());
-                R_UNLESS(size >= 0,                                      fs::ResultInvalidSize());
-                R_UNLESS(util::CanAddWithoutOverflow<s64>(offset, size), fs::ResultOutOfRange());
-                R_UNLESS(offset + size <= total_size,                    fs::ResultOutOfRange());
-                R_SUCCEED();
+            static inline bool CheckAccessRange(s64 offset, s64 size, s64 total_size) {
+                return offset >= 0 &&
+                       size >= 0 &&
+                       size <= total_size &&
+                       offset <= (total_size - size);
             }
 
-            static ALWAYS_INLINE Result CheckAccessRange(s64 offset, size_t size, s64 total_size) {
-                R_RETURN(CheckAccessRange(offset, static_cast<s64>(size), total_size));
+            static inline bool CheckAccessRange(s64 offset, size_t size, s64 total_size) {
+                return CheckAccessRange(offset, static_cast<s64>(size), total_size);
             }
 
-            static inline Result CheckOffsetAndSize(s64 offset, s64 size) {
-                R_UNLESS(offset >= 0,                                    fs::ResultInvalidOffset());
-                R_UNLESS(size >= 0,                                      fs::ResultInvalidSize());
-                R_UNLESS(util::CanAddWithoutOverflow<s64>(offset, size), fs::ResultOutOfRange());
-                R_SUCCEED();
+            static inline bool CheckOffsetAndSize(s64 offset, s64 size) {
+                return offset >= 0 &&
+                       size >= 0 &&
+                       offset <= (offset + size);
             }
 
-            static ALWAYS_INLINE Result CheckOffsetAndSize(s64 offset, size_t size) {
-                R_RETURN(CheckOffsetAndSize(offset, static_cast<s64>(size)));
-            }
-
-            static inline Result CheckOffsetAndSizeWithResult(s64 offset, s64 size, Result fail_result) {
-                R_TRY_CATCH(CheckOffsetAndSize(offset, size)) {
-                    R_CONVERT_ALL(fail_result);
-                } R_END_TRY_CATCH;
-                R_SUCCEED();
-            }
-
-            static ALWAYS_INLINE Result CheckOffsetAndSizeWithResult(s64 offset, size_t size, Result fail_result) {
-                R_RETURN(CheckOffsetAndSizeWithResult(offset, static_cast<s64>(size), fail_result));
+            static inline bool CheckOffsetAndSize(s64 offset, size_t size) {
+                return CheckOffsetAndSize(offset, static_cast<s64>(size));
             }
     };
 
@@ -73,23 +60,23 @@ namespace ams::fs {
             ReadOnlyStorageAdapter(IStorage &s) : m_storage(s) { /* ... */ }
 
             virtual Result Read(s64 offset, void *buffer, size_t size) override {
-                R_RETURN(m_storage.Read(offset, buffer, size));
+                return m_storage.Read(offset, buffer, size);
             }
 
             virtual Result Flush() override {
-                R_RETURN(m_storage.Flush());
+                return m_storage.Flush();
             }
 
             virtual Result GetSize(s64 *out) override {
-                R_RETURN(m_storage.GetSize(out));
+                return m_storage.GetSize(out);
             }
 
             virtual Result Write(s64 offset, const void *buffer, size_t size) override {
-                R_THROW(fs::ResultUnsupportedOperation());
+                return fs::ResultUnsupportedOperation();
             }
 
             virtual Result SetSize(s64 size) override {
-                R_THROW(fs::ResultUnsupportedOperation());
+                return fs::ResultUnsupportedOperation();
             }
     };
 
@@ -106,9 +93,9 @@ namespace ams::fs {
                 R_SUCCEED_IF(size == 0);
 
                 /* Validate arguments and read. */
-                R_UNLESS(buffer != nullptr, fs::ResultNullptrArgument());
-                R_TRY(IStorage::CheckAccessRange(offset, size, m_size));
-                R_RETURN(m_storage.Read(m_offset + offset, buffer, size));
+                R_UNLESS(buffer != nullptr,                                fs::ResultNullptrArgument());
+                R_UNLESS(IStorage::CheckAccessRange(offset, size, m_size), fs::ResultOutOfRange());
+                return m_storage.Read(m_offset + offset, buffer, size);
             }
 
             virtual Result Write(s64 offset, const void *buffer, size_t size) override{
@@ -116,22 +103,22 @@ namespace ams::fs {
                 R_SUCCEED_IF(size == 0);
 
                 /* Validate arguments and write. */
-                R_UNLESS(buffer != nullptr, fs::ResultNullptrArgument());
-                R_TRY(IStorage::CheckAccessRange(offset, size, m_size));
-                R_RETURN(m_storage.Write(m_offset + offset, buffer, size));
+                R_UNLESS(buffer != nullptr,                                fs::ResultNullptrArgument());
+                R_UNLESS(IStorage::CheckAccessRange(offset, size, m_size), fs::ResultOutOfRange());
+                return m_storage.Write(m_offset + offset, buffer, size);
             }
 
             virtual Result Flush() override {
-                R_RETURN(m_storage.Flush());
+                return m_storage.Flush();
             }
 
             virtual Result GetSize(s64 *out) override {
                 *out = m_size;
-                R_SUCCEED();
+                return ResultSuccess();
             }
 
             virtual Result SetSize(s64 size) override {
-                R_THROW(fs::ResultUnsupportedSetSizeForNotResizableSubStorage());
+                return fs::ResultUnsupportedSetSizeForNotResizableSubStorage();
             }
     };
 

fusee/program/source/fusee_emummc.cpp

@@ -33,11 +33,11 @@ namespace ams::nxboot {
                         ShowFatalError("SdCard: unaligned access to %" PRIx64 ", size=%" PRIx64"\n", static_cast<u64>(offset), static_cast<u64>(size));
                     }
 
-                    R_RETURN(ReadSdCard(buffer, size, offset / sdmmc::SectorSize, size / sdmmc::SectorSize));
+                    return ReadSdCard(buffer, size, offset / sdmmc::SectorSize, size / sdmmc::SectorSize);
                 }
 
                 virtual Result Flush() override {
-                    R_SUCCEED();
+                    return ResultSuccess();
                 }
 
                 virtual Result GetSize(s64 *out) override {
@@ -45,15 +45,15 @@ namespace ams::nxboot {
                     R_TRY(GetSdCardMemoryCapacity(std::addressof(num_sectors)));
 
                     *out = static_cast<s64>(num_sectors) * static_cast<s64>(sdmmc::SectorSize);
-                    R_SUCCEED();
+                    return ResultSuccess();
                 }
 
                 virtual Result Write(s64 offset, const void *buffer, size_t size) override {
-                    R_THROW(fs::ResultUnsupportedOperation());
+                    return fs::ResultUnsupportedOperation();
                 }
 
                 virtual Result SetSize(s64 size) override {
-                    R_THROW(fs::ResultUnsupportedOperation());
+                    return fs::ResultUnsupportedOperation();
                 }
         };
 
@@ -67,11 +67,11 @@ namespace ams::nxboot {
                         ShowFatalError("SdCard: unaligned access to %" PRIx64 ", size=%" PRIx64"\n", static_cast<u64>(offset), static_cast<u64>(size));
                     }
 
-                    R_RETURN(ReadMmc(buffer, size, Partition, offset / sdmmc::SectorSize, size / sdmmc::SectorSize));
+                    return ReadMmc(buffer, size, Partition, offset / sdmmc::SectorSize, size / sdmmc::SectorSize);
                 }
 
                 virtual Result Flush() override {
-                    R_SUCCEED();
+                    return ResultSuccess();
                 }
 
                 virtual Result GetSize(s64 *out) override {
@@ -79,15 +79,15 @@ namespace ams::nxboot {
                     R_TRY(GetMmcMemoryCapacity(std::addressof(num_sectors), Partition));
 
                     *out = num_sectors * sdmmc::SectorSize;
-                    R_SUCCEED();
+                    return ResultSuccess();
                 }
 
                 virtual Result Write(s64 offset, const void *buffer, size_t size) override {
-                    R_THROW(fs::ResultUnsupportedOperation());
+                    return fs::ResultUnsupportedOperation();
                 }
 
                 virtual Result SetSize(s64 size) override {
-                    R_THROW(fs::ResultUnsupportedOperation());
+                    return fs::ResultUnsupportedOperation();
                 }
         };
 
@@ -153,23 +153,23 @@ namespace ams::nxboot {
                         subofs = 0;
                     }
 
-                    R_SUCCEED();
+                    return ResultSuccess();
                 }
 
                 virtual Result Flush() override {
-                    R_THROW(fs::ResultUnsupportedOperation());
+                    return fs::ResultUnsupportedOperation();
                 }
 
                 virtual Result GetSize(s64 *out) override {
-                    R_THROW(fs::ResultUnsupportedOperation());
+                    return fs::ResultUnsupportedOperation();
                 }
 
                 virtual Result Write(s64 offset, const void *buffer, size_t size) override {
-                    R_THROW(fs::ResultUnsupportedOperation());
+                    return fs::ResultUnsupportedOperation();
                 }
 
                 virtual Result SetSize(s64 size) override {
-                    R_THROW(fs::ResultUnsupportedOperation());
+                    return fs::ResultUnsupportedOperation();
                 }
         };
 
@@ -349,11 +349,11 @@ namespace ams::nxboot {
     }
 
     Result ReadBoot0(s64 offset, void *dst, size_t size) {
-        R_RETURN(g_boot0_storage->Read(offset, dst, size));
+        return g_boot0_storage->Read(offset, dst, size);
     }
 
     Result ReadPackage2(s64 offset, void *dst, size_t size) {
-        R_RETURN(g_package2_storage->Read(offset, dst, size));
+        return g_package2_storage->Read(offset, dst, size);
     }
 
 }

fusee/program/source/fusee_fatal.cpp

@@ -45,7 +45,7 @@ namespace ams::nxboot {
             /* Write the context to the file. */
             R_TRY(fs::WriteFile(file, 0, ctx, sizeof(*ctx), fs::WriteOption::Flush));
 
-            R_SUCCEED();
+            return ResultSuccess();
         }
 
     }

fusee/program/source/fusee_key_derivation.cpp

@@ -23,17 +23,17 @@ namespace ams::nxboot {
 
         alignas(se::AesBlockSize) constexpr inline const u8 MarikoMasterKekSource[se::AesBlockSize] = {
             /* TODO: Update on next change of keys. */
-            0xA5, 0xEC, 0x16, 0x39, 0x1A, 0x30, 0x16, 0x08, 0x2E, 0xCF, 0x09, 0x6F, 0x5E, 0x7C, 0xEE, 0xA9
+            0xD2, 0x68, 0xC6, 0x53, 0x9D, 0x94, 0xF9, 0xA8, 0xA5, 0xA8, 0xA7, 0xC8, 0x8F, 0x53, 0x4B, 0x7A
         };
 
         alignas(se::AesBlockSize) constexpr inline const u8 MarikoMasterKekSourceDev[se::AesBlockSize] = {
             /* TODO: Update on next change of keys. */
-            0x3A, 0x9C, 0xF0, 0x39, 0x70, 0x23, 0xF6, 0xAF, 0x71, 0x44, 0x60, 0xF4, 0x6D, 0xED, 0xA1, 0xD6
+            0xEC, 0x5E, 0xB5, 0x11, 0xD5, 0x43, 0x1E, 0x6A, 0x4E, 0x54, 0x6F, 0xD4, 0xD3, 0x22, 0xCE, 0x87
         };
 
         alignas(se::AesBlockSize) constexpr inline const u8 EristaMasterKekSource[se::AesBlockSize] = {
             /* TODO: Update on next change of keys. */
-            0x99, 0x22, 0x09, 0x57, 0xA7, 0xF9, 0x5E, 0x94, 0xFE, 0x78, 0x7F, 0x41, 0xD6, 0xE7, 0x56, 0xE6
+            0xF0, 0x13, 0x37, 0x9A, 0xD5, 0x63, 0x51, 0xC3, 0xB4, 0x96, 0x35, 0xBC, 0x9C, 0xE8, 0x76, 0x81
         };
 
         alignas(se::AesBlockSize) constexpr inline const u8 KeyblobKeySource[se::AesBlockSize] = {
@@ -68,8 +68,6 @@ namespace ams::nxboot {
             { 0xAA, 0xFD, 0xBC, 0xBB, 0x25, 0xC3, 0xA4, 0xEF, 0xE3, 0xEE, 0x58, 0x53, 0xB7, 0xF8, 0xDD, 0xD6 }, /* 12.1.0 Device Master Key Source Source. */
             { 0xE4, 0xF3, 0x45, 0x6F, 0x18, 0xA1, 0x89, 0xF8, 0xDA, 0x4C, 0x64, 0x75, 0x68, 0xE6, 0xBD, 0x4F }, /* 13.0.0 Device Master Key Source Source. */
             { 0x5B, 0x94, 0x63, 0xF7, 0xAD, 0x96, 0x1B, 0xA6, 0x23, 0x30, 0x06, 0x4D, 0x01, 0xE4, 0xCE, 0x1D }, /* 14.0.0 Device Master Key Source Source. */
-            { 0x5E, 0xC9, 0xC5, 0x0A, 0xD0, 0x5F, 0x8B, 0x7B, 0xA7, 0x39, 0xEA, 0xBC, 0x60, 0x0F, 0x74, 0xE6 }, /* 15.0.0 Device Master Key Source Source. */
-            { 0xEA, 0x90, 0x6E, 0xA8, 0xAE, 0x92, 0x99, 0x64, 0x36, 0xC1, 0xF3, 0x1C, 0xC6, 0x32, 0x83, 0x8C }, /* 16.0.0 Device Master Key Source Source. */
         };
 
         alignas(se::AesBlockSize) constexpr inline const u8 DeviceMasterKekSources[pkg1::OldDeviceMasterKeyCount][se::AesBlockSize] = {
@@ -84,8 +82,6 @@ namespace ams::nxboot {
             { 0xC2, 0x65, 0x34, 0x6E, 0xC7, 0xC6, 0x5D, 0x97, 0x3E, 0x34, 0x5C, 0x6B, 0xB3, 0x7E, 0xC6, 0xE3 }, /* 12.1.0 Device Master Kek Source. */
             { 0x77, 0x52, 0x92, 0xF0, 0xAA, 0xE3, 0xFB, 0xE0, 0x60, 0x16, 0xB3, 0x78, 0x68, 0x53, 0xF7, 0xA8 }, /* 13.0.0 Device Master Kek Source. */
             { 0x67, 0xD5, 0xD6, 0x0C, 0x08, 0xF5, 0xA3, 0x11, 0xBD, 0x6D, 0x5A, 0xEB, 0x96, 0x24, 0xB0, 0xD2 }, /* 14.0.0 Device Master Kek Source. */
-            { 0x7C, 0x30, 0xED, 0x8B, 0x39, 0x25, 0x2C, 0x08, 0x8F, 0x48, 0xDC, 0x28, 0xE6, 0x1A, 0x6B, 0x49 }, /* 15.0.0 Device Master Kek Source. */
-            { 0xF0, 0xF3, 0xFF, 0x52, 0x75, 0x2F, 0xBA, 0x4D, 0x09, 0x72, 0x30, 0x89, 0xA9, 0xDF, 0xFE, 0x1F }, /* 16.0.0 Device Master Kek Source. */
         };
 
         alignas(se::AesBlockSize) constexpr inline const u8 DeviceMasterKekSourcesDev[pkg1::OldDeviceMasterKeyCount][se::AesBlockSize] = {
@@ -100,8 +96,6 @@ namespace ams::nxboot {
             { 0xC4, 0xBB, 0xF3, 0x9F, 0xA3, 0xAA, 0x00, 0x99, 0x7C, 0x97, 0xAD, 0x91, 0x8F, 0xE8, 0x45, 0xCB }, /* 12.1.0 Device Master Kek Source. */
             { 0x20, 0x20, 0xAA, 0xFB, 0x89, 0xC2, 0xF0, 0x70, 0xB5, 0xE0, 0xA3, 0x11, 0x8A, 0x29, 0x8D, 0x0F }, /* 13.0.0 Device Master Kek Source. */
             { 0xCE, 0x14, 0x74, 0x66, 0x98, 0xA8, 0x6D, 0x7D, 0xBD, 0x54, 0x91, 0x68, 0x5F, 0x1D, 0x0E, 0xEA }, /* 14.0.0 Device Master Kek Source. */
-            { 0xAE, 0x05, 0x48, 0x65, 0xAB, 0x17, 0x9D, 0x3D, 0x51, 0xB7, 0x56, 0xBD, 0x9B, 0x0B, 0x5B, 0x6E }, /* 15.0.0 Device Master Kek Source. */
-            { 0xFF, 0xF6, 0x4B, 0x0F, 0xFF, 0x0D, 0xC0, 0x4F, 0x56, 0x8A, 0x40, 0x74, 0x67, 0xC5, 0xFE, 0x9F }, /* 16.0.0 Device Master Kek Source. */
         };
 
         alignas(se::AesBlockSize) constexpr inline const u8 MasterKeySources[pkg1::KeyGeneration_Count][se::AesBlockSize] = {
@@ -119,8 +113,6 @@ namespace ams::nxboot {
             { 0xC1, 0x8D, 0x16, 0xBB, 0x2A, 0xE4, 0x1D, 0xD4, 0xC2, 0xC1, 0xB6, 0x40, 0x94, 0x35, 0x63, 0x98 }, /* Master key 0A encrypted with Master key 0B. */
             { 0xA3, 0x24, 0x65, 0x75, 0xEA, 0xCC, 0x6E, 0x8D, 0xFB, 0x5A, 0x16, 0x50, 0x74, 0xD2, 0x15, 0x06 }, /* Master key 0B encrypted with Master key 0C. */
             { 0x83, 0x67, 0xAF, 0x01, 0xCF, 0x93, 0xA1, 0xAB, 0x80, 0x45, 0xF7, 0x3F, 0x72, 0xFD, 0x3B, 0x38 }, /* Master key 0C encrypted with Master key 0D. */
-            { 0xB1, 0x81, 0xA6, 0x0D, 0x72, 0xC7, 0xEE, 0x15, 0x21, 0xF3, 0xC0, 0xB5, 0x6B, 0x61, 0x6D, 0xE7 }, /* Master key 0D encrypted with Master key 0E. */
-            { 0xAF, 0x11, 0x4C, 0x67, 0x17, 0x7A, 0x52, 0x43, 0xF7, 0x70, 0x2F, 0xC7, 0xEF, 0x81, 0x72, 0x16 }, /* Master key 0E encrypted with Master key 0F. */
         };
 
         alignas(se::AesBlockSize) constexpr inline const u8 MasterKeySourcesDev[pkg1::KeyGeneration_Count][se::AesBlockSize] = {
@@ -138,8 +130,6 @@ namespace ams::nxboot {
             { 0x21, 0x88, 0x6B, 0x10, 0x9E, 0x83, 0xD6, 0x52, 0xAB, 0x08, 0xDB, 0x6D, 0x39, 0xFF, 0x1C, 0x9C }, /* Master key 0A encrypted with Master key 0B. */
             { 0x8A, 0xCE, 0xC4, 0x7F, 0xBE, 0x08, 0x61, 0x88, 0xD3, 0x73, 0x64, 0x51, 0xE2, 0xB6, 0x53, 0x15 }, /* Master key 0B encrypted with Master key 0C. */
             { 0x08, 0xE0, 0xF4, 0xBE, 0xAA, 0x6E, 0x5A, 0xC3, 0xA6, 0xBC, 0xFE, 0xB9, 0xE2, 0xA3, 0x24, 0x12 }, /* Master key 0C encrypted with Master key 0D. */
-            { 0xD6, 0x80, 0x98, 0xC0, 0xFA, 0xC7, 0x13, 0xCB, 0x93, 0xD2, 0x0B, 0x82, 0x4C, 0xA1, 0x7B, 0x8D }, /* Master key 0D encrypted with Master key 0E. */
-            { 0x78, 0x66, 0x19, 0xBD, 0x86, 0xE7, 0xC1, 0x09, 0x9B, 0x6F, 0x92, 0xB2, 0x58, 0x7D, 0xCF, 0x26 }, /* Master key 0E encrypted with Master key 0F. */
         };
 
         alignas(se::AesBlockSize) constinit u8 MasterKeys[pkg1::OldMasterKeyCount][se::AesBlockSize] = {};

fusee/program/source/fusee_mmc.cpp

@@ -34,7 +34,7 @@ namespace ams::nxboot {
                 g_mmc_partition = partition;
             }
 
-            R_SUCCEED();
+            return ResultSuccess();
         }
 
     }
@@ -47,29 +47,29 @@ namespace ams::nxboot {
         sdmmc::SetMmcWorkBuffer(MmcPort, g_mmc_work_buffer, sizeof(g_mmc_work_buffer));
 
         /* Activate the mmc. */
-        R_RETURN(sdmmc::Activate(MmcPort));
+        return sdmmc::Activate(MmcPort);
     }
 
     Result CheckMmcConnection(sdmmc::SpeedMode *out_sm, sdmmc::BusWidth *out_bw) {
-        R_RETURN(sdmmc::CheckMmcConnection(out_sm, out_bw, MmcPort));
+        return sdmmc::CheckMmcConnection(out_sm, out_bw, MmcPort);
     }
 
     Result GetMmcMemoryCapacity(u32 *out_num_sectors, sdmmc::MmcPartition partition) {
         if (partition == sdmmc::MmcPartition_UserData) {
-            R_RETURN(sdmmc::GetDeviceMemoryCapacity(out_num_sectors, MmcPort));
+            return sdmmc::GetDeviceMemoryCapacity(out_num_sectors, MmcPort);
         } else {
-            R_RETURN(sdmmc::GetMmcBootPartitionCapacity(out_num_sectors, MmcPort));
+            return sdmmc::GetMmcBootPartitionCapacity(out_num_sectors, MmcPort);
         }
     }
 
     Result ReadMmc(void *dst, size_t size, sdmmc::MmcPartition partition, size_t sector_index, size_t sector_count) {
         R_TRY(SelectMmcPartition(partition));
-        R_RETURN(sdmmc::Read(dst, size, MmcPort, sector_index, sector_count));
+        return sdmmc::Read(dst, size, MmcPort, sector_index, sector_count);
     }
 
     Result WriteMmc(sdmmc::MmcPartition partition, size_t sector_index, size_t sector_count, const void *src, size_t size) {
         R_TRY(SelectMmcPartition(partition));
-        R_RETURN(sdmmc::Write(MmcPort, sector_index, sector_count, src, size));
+        return sdmmc::Write(MmcPort, sector_index, sector_count, src, size);
     }
 
 }

fusee/program/source/fusee_package2.cpp

@@ -80,7 +80,7 @@ namespace ams::nxboot {
             }
 
             /* Check that the key generation is one that we can use. */
-            static_assert(pkg1::KeyGeneration_Count == 16);
+            static_assert(pkg1::KeyGeneration_Count == 14);
             if (key_generation >= pkg1::KeyGeneration_Count) {
                 return false;
             }

fusee/program/source/fusee_sd_card.cpp

@@ -78,7 +78,7 @@ namespace ams::nxboot {
         sdmmc::SetSdCardWorkBuffer(SdCardPort, g_sd_work_buffer, sizeof(g_sd_work_buffer));
 
         /* Activate the SD card. */
-        R_RETURN(sdmmc::Activate(SdCardPort));
+        return sdmmc::Activate(SdCardPort);
     }
 
     void FinalizeSdCard() {
@@ -90,19 +90,19 @@ namespace ams::nxboot {
     }
 
     Result CheckSdCardConnection(sdmmc::SpeedMode *out_sm, sdmmc::BusWidth *out_bw) {
-        R_RETURN(sdmmc::CheckSdCardConnection(out_sm, out_bw, SdCardPort));
+        return sdmmc::CheckSdCardConnection(out_sm, out_bw, SdCardPort);
     }
 
     Result GetSdCardMemoryCapacity(u32 *out_num_sectors) {
-        R_RETURN(sdmmc::GetDeviceMemoryCapacity(out_num_sectors, SdCardPort));
+        return sdmmc::GetDeviceMemoryCapacity(out_num_sectors, SdCardPort);
     }
 
     Result ReadSdCard(void *dst, size_t size, size_t sector_index, size_t sector_count) {
-        R_RETURN(sdmmc::Read(dst, size, SdCardPort, sector_index, sector_count));
+        return sdmmc::Read(dst, size, SdCardPort, sector_index, sector_count);
     }
 
     Result WriteSdCard(size_t sector_index, size_t sector_count, const void *src, size_t size) {
-        R_RETURN(sdmmc::Write(SdCardPort, sector_index, sector_count, src, size));
+        return sdmmc::Write(SdCardPort, sector_index, sector_count, src, size);
     }
 
 }

fusee/program/source/fusee_setup_horizon.cpp

@@ -253,10 +253,6 @@ namespace ams::nxboot {
                         return ams::TargetFirmware_13_2_1;
                     } else if (std::memcmp(package1 + 0x10, "20220209", 8) == 0) {
                         return ams::TargetFirmware_14_0_0;
-                    } else if (std::memcmp(package1 + 0x10, "20220801", 8) == 0) {
-                        return ams::TargetFirmware_15_0_0;
-                    } else if (std::memcmp(package1 + 0x10, "20230111", 8) == 0) {
-                        return ams::TargetFirmware_16_0_0;
                     }
                     break;
                 default:

fusee/program/source/fusee_stratosphere.cpp

@@ -156,12 +156,6 @@ namespace ams::nxboot {
             FsVersion_14_0_0,
             FsVersion_14_0_0_Exfat,
 
-            FsVersion_15_0_0,
-            FsVersion_15_0_0_Exfat,
-
-            FsVersion_16_0_0,
-            FsVersion_16_0_0_Exfat,
-
             FsVersion_Count,
         };
 
@@ -233,12 +227,6 @@ namespace ams::nxboot {
 
             { 0x88, 0x7A, 0xC1, 0x50, 0x80, 0x6C, 0x75, 0xCC }, /* FsVersion_14_0_0 */
             { 0xD4, 0x88, 0xD1, 0xF2, 0x92, 0x17, 0x35, 0x5C }, /* FsVersion_14_0_0_Exfat */
-
-            { 0xD0, 0xD4, 0x49, 0x18, 0x14, 0xB5, 0x62, 0xAF }, /* FsVersion_15_0_0 */
-            { 0x34, 0xC0, 0xD9, 0xED, 0x6A, 0xD1, 0x87, 0x3D }, /* FsVersion_15_0_0_Exfat */
-
-            { 0x56, 0xE8, 0x56, 0x56, 0x6C, 0x38, 0xD8, 0xBE }, /* FsVersion_16_0_0 */
-            { 0xCF, 0xAB, 0x45, 0x0C, 0x2C, 0x53, 0x9D, 0xA9 }, /* FsVersion_16_0_0_Exfat */
         };
 
         const InitialProcessBinaryHeader *FindInitialProcessBinary(const pkg2::Package2Header *header, const u8 *data, ams::TargetFirmware target_firmware) {
@@ -640,22 +628,6 @@ namespace ams::nxboot {
                     AddPatch(fs_meta, 0x195769, NogcPatch0, sizeof(NogcPatch0));
                     AddPatch(fs_meta, 0x16F6B0, NogcPatch1, sizeof(NogcPatch1));
                     break;
-                case FsVersion_15_0_0:
-                    AddPatch(fs_meta, 0x184259, NogcPatch0, sizeof(NogcPatch0));
-                    AddPatch(fs_meta, 0x15EDE4, NogcPatch1, sizeof(NogcPatch1));
-                    break;
-                case FsVersion_15_0_0_Exfat:
-                    AddPatch(fs_meta, 0x18F1E9, NogcPatch0, sizeof(NogcPatch0));
-                    AddPatch(fs_meta, 0x169D74, NogcPatch1, sizeof(NogcPatch1));
-                    break;
-                case FsVersion_16_0_0:
-                    AddPatch(fs_meta, 0x1866D9, NogcPatch0, sizeof(NogcPatch0));
-                    AddPatch(fs_meta, 0x160C70, NogcPatch1, sizeof(NogcPatch1));
-                    break;
-                case FsVersion_16_0_0_Exfat:
-                    AddPatch(fs_meta, 0x1913B9, NogcPatch0, sizeof(NogcPatch0));
-                    AddPatch(fs_meta, 0x16B950, NogcPatch1, sizeof(NogcPatch1));
-                    break;
                 default:
                     break;
             }

fusee/program/source/sdram/fusee_sdram.cpp

@@ -85,6 +85,7 @@ namespace ams::nxboot {
                     HANDLE_DRAM_CASE( 3, 12)
                     HANDLE_DRAM_CASE( 5, 12)
                     HANDLE_DRAM_CASE( 6, 12)
+                    HANDLE_DRAM_CASE( 7,  0)
                     HANDLE_DRAM_CASE( 8,  1)
                     HANDLE_DRAM_CASE( 9,  2)
                     HANDLE_DRAM_CASE(10,  3)
@@ -93,6 +94,7 @@ namespace ams::nxboot {
                     HANDLE_DRAM_CASE(13,  2)
                     HANDLE_DRAM_CASE(14,  3)
                     HANDLE_DRAM_CASE(15,  4)
+                    HANDLE_DRAM_CASE(16,  5)
                     HANDLE_DRAM_CASE(17,  6)
                     HANDLE_DRAM_CASE(18,  7)
                     HANDLE_DRAM_CASE(19,  6)
@@ -105,12 +107,6 @@ namespace ams::nxboot {
                     HANDLE_DRAM_CASE(26, 11)
                     HANDLE_DRAM_CASE(27, 11)
                     HANDLE_DRAM_CASE(28,  7)
-                    HANDLE_DRAM_CASE(29,  0)
-                    HANDLE_DRAM_CASE(30,  0)
-                    HANDLE_DRAM_CASE(31,  0)
-                    HANDLE_DRAM_CASE(32,  5)
-                    HANDLE_DRAM_CASE(33,  5)
-                    HANDLE_DRAM_CASE(34,  5)
                     default:
                         AMS_ABORT("Invalid DRAM id");
                 }

libraries/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/Atmosphere-NX/Atmosphere-libs
 	branch = master
-	commit = b1607dc8a3d85bc8c859c60d70ebb4a3dcbb85b8
-	parent = f1ad26ce844ab7a63b948281b50c12e5d1dac8ce
+	commit = 0d161b8588aa6482b84f3c44dd001055b01a047f
+	parent = 4efa5d7dd0bfbdf89a6261af0aef3878ca784b05
 	method = merge
 	cmdver = 0.4.1

libraries/config/os/windows/os.mk

@@ -1,5 +1,5 @@
 export ATMOSPHERE_DEFINES  += -DATMOSPHERE_OS_WINDOWS
-export ATMOSPHERE_SETTINGS += -fno-omit-frame-pointer -fno-data-sections
+export ATMOSPHERE_SETTINGS += -fno-omit-frame-pointer
 export ATMOSPHERE_CFLAGS   +=
 export ATMOSPHERE_CXXFLAGS +=
 export ATMOSPHERE_ASFLAGS  +=

libraries/config/templates/stratosphere.mk

@@ -58,7 +58,7 @@ export CXXWRAPS := -Wl,--wrap,__cxa_pure_virtual \
 			-Wl,--wrap,exit
 else ifeq ($(ATMOSPHERE_BOARD),generic_windows)
 export CXXREQUIRED :=
-export CXXWRAPS    := -Wl,--wrap,__p__acmdln -Wl,--wrap,_set_invalid_parameter_handler
+export CXXWRAPS    := -Wl,--wrap,__p__acmdln
 else
 export CXXREQUIRED :=
 export CXXWRAPS    :=
@@ -67,8 +67,6 @@ endif
 
 ifeq ($(ATMOSPHERE_BOARD),nx-hac-001)
 export LDFLAGS     = -specs=$(ATMOSPHERE_LIBRARIES_DIR)/libstratosphere/stratosphere.specs -specs=$(DEVKITPRO)/libnx/switch.specs $(CXXFLAGS) $(CXXWRAPS) $(CXXREQUIRED) -Wl,-Map,$(notdir $*.map)
-else ifeq ($(ATMOSPHERE_OS_NAME),macos)
-export LDFLAGS     = $(CXXFLAGS) $(CXXWRAPS) $(CXXREQUIRED) -Wl,-map,$(notdir $@.map)
 else
 export LDFLAGS     = $(CXXFLAGS) $(CXXWRAPS) $(CXXREQUIRED) -Wl,-Map,$(notdir $@.map)
 endif

libraries/libexosphere/include/exosphere/fuse.hpp

@@ -55,7 +55,7 @@ namespace ams::fuse {
         DramId_IcosaSamsung6GB    =  4,
         DramId_HoagHynix1y4GB     =  5,
         DramId_AulaHynix1y4GB     =  6,
-        DramId_Deprecated7        =  7,
+        DramId_IowaX1X2Samsung4GB =  7,
         DramId_IowaSansung4GB     =  8,
         DramId_IowaSamsung8GB     =  9,
         DramId_IowaHynix4GB       = 10,
@@ -64,7 +64,7 @@ namespace ams::fuse {
         DramId_HoagSamsung8GB     = 13,
         DramId_HoagHynix4GB       = 14,
         DramId_HoagMicron4GB      = 15,
-        DramId_Deprecated16       = 16,
+        DramId_IowaSamsung4GBY    = 16,
         DramId_IowaSamsung1y4GBX  = 17,
         DramId_IowaSamsung1y8GBX  = 18,
         DramId_HoagSamsung1y4GBX  = 19,
@@ -77,12 +77,6 @@ namespace ams::fuse {
         DramId_HoagMicron1y4GB    = 26,
         DramId_AulaMicron1y4GB    = 27,
         DramId_AulaSamsung1y8GBX  = 28,
-        DramId_IowaX1X2Samsung4GB = 29,
-        DramId_HoagX1X2Samsung4GB = 30,
-        DramId_AulaX1X2Samsung4GB = 31,
-        DramId_IowaSamsung4GBY    = 32,
-        DramId_HoagSamsung4GBY    = 33,
-        DramId_AulaSamsung4GBY    = 34,
 
         DramId_Count,
     };
@@ -125,4 +119,4 @@ namespace ams::fuse {
     bool IsOdmProductionMode();
     void ConfigureFuseBypass();
 
-}
+}

libraries/libexosphere/include/exosphere/pkg1/pkg1_boot_config.hpp

@@ -27,7 +27,7 @@ namespace ams::pkg1 {
     enum MemoryArrange {
         MemoryArrange_Normal    = 1,
         MemoryArrange_AppletDev = 2,
-        MemoryArrange_SystemDev = 3,
+        MemoryArrange_SystemDev = 2,
     };
 
     enum MemoryMode {

libraries/libexosphere/include/exosphere/pkg1/pkg1_key_generation.hpp

@@ -34,8 +34,6 @@ namespace ams::pkg1 {
         KeyGeneration_12_1_0 = 0x0B,
         KeyGeneration_13_0_0 = 0x0C,
         KeyGeneration_14_0_0 = 0x0D,
-        KeyGeneration_15_0_0 = 0x0E,
-        KeyGeneration_16_0_0 = 0x0F,
 
         KeyGeneration_Count,
 

libraries/libexosphere/include/exosphere/pkg2.hpp

@@ -23,8 +23,8 @@ namespace ams::pkg2 {
 
     constexpr inline int PayloadCount = 3;
 
-    constexpr inline int MinimumValidDataVersion  = 0;   /* We allow older package2 to load; this value is currently 0x17 in Nintendo's code. */
-    constexpr inline int CurrentBootloaderVersion = 0x13;
+    constexpr inline int MinimumValidDataVersion  = 0;   /* We allow older package2 to load; this value is currently 0x15 in Nintendo's code. */
+    constexpr inline int CurrentBootloaderVersion = 0x11;
 
     struct Package2Meta {
         using Magic = util::FourCC<'P','K','2','1'>;

libraries/libexosphere/source/fuse/fuse_api.cpp

@@ -39,13 +39,12 @@ namespace ams::fuse {
         struct OdmWord4 {
             using HardwareState1                = util::BitPack32::Field<0,                                   2, int>;
             using HardwareType1                 = util::BitPack32::Field<HardwareState1::Next,                1, int>;
-            using DramId1                       = util::BitPack32::Field<HardwareType1::Next,                 5, int>;
-            using HardwareType2                 = util::BitPack32::Field<DramId1::Next,                       1, int>;
+            using DramId                        = util::BitPack32::Field<HardwareType1::Next,                 5, int>;
+            using HardwareType2                 = util::BitPack32::Field<DramId::Next,                        1, int>;
             using HardwareState2                = util::BitPack32::Field<HardwareType2::Next,                 1, int>;
             using RetailInteractiveDisplayState = util::BitPack32::Field<HardwareState2::Next,                1, int>;
             using FormatVersion                 = util::BitPack32::Field<RetailInteractiveDisplayState::Next, 1, int>;
-            using DramId2                       = util::BitPack32::Field<FormatVersion::Next,                 3, int>;
-            using Reserved                      = util::BitPack32::Field<DramId2::Next,                       1, int>;
+            using Reserved                      = util::BitPack32::Field<FormatVersion::Next,                 4, int>;
             using HardwareType3                 = util::BitPack32::Field<Reserved::Next,                      4, int>;
         };
 
@@ -72,15 +71,6 @@ namespace ams::fuse {
                    (odm_word4.Get<OdmWord4::HardwareType3>() << HardwareType3Shift);
         }
 
-        constexpr ALWAYS_INLINE int GetDramIdValue(const util::BitPack32 odm_word4) {
-            constexpr auto DramId1Shift = 0;
-            constexpr auto DramId2Shift = OdmWord4::DramId1::Count + DramId1Shift;
-
-
-            return (odm_word4.Get<OdmWord4::DramId1>() << DramId1Shift) |
-                   (odm_word4.Get<OdmWord4::DramId2>() << DramId2Shift);
-        }
-
         constinit uintptr_t g_register_address = secmon::MemoryRegionPhysicalDeviceFuses.GetAddress();
 
         constinit bool g_checked_for_rcm_bug_patch  = false;
@@ -177,8 +167,6 @@ namespace ams::fuse {
         }
 
         constexpr const TargetFirmware FuseVersionIncrementFirmwares[] = {
-            TargetFirmware_16_0_0,
-            TargetFirmware_15_0_0,
             TargetFirmware_13_2_1,
             TargetFirmware_12_0_2,
             TargetFirmware_11_0_0,
@@ -317,8 +305,7 @@ namespace ams::fuse {
     }
 
     DramId GetDramId() {
-        /* Get the value. */
-        return static_cast<DramId>(GetDramIdValue(util::BitPack32{GetCommonOdmWord(4)}));
+        return static_cast<DramId>(util::BitPack32{GetCommonOdmWord(4)}.Get<OdmWord4::DramId>());
     }
 
     HardwareType GetHardwareType() {

libraries/libmesosphere/include/mesosphere/arch/arm64/init/kern_k_init_arguments.hpp

@@ -29,6 +29,8 @@ namespace ams::kern::init {
         u64 sp;
         u64 entrypoint;
         u64 argument;
+        u64 setup_function;
+        u64 exception_stack;
     };
     static_assert(alignof(KInitArguments) == util::CeilingPowerOfTwo(INIT_ARGUMENTS_SIZE));
     static_assert(sizeof(KInitArguments) == std::max(INIT_ARGUMENTS_SIZE, util::CeilingPowerOfTwo(INIT_ARGUMENTS_SIZE)));
@@ -43,5 +45,7 @@ namespace ams::kern::init {
     static_assert(AMS_OFFSETOF(KInitArguments, sp)              == INIT_ARGUMENTS_SP);
     static_assert(AMS_OFFSETOF(KInitArguments, entrypoint)      == INIT_ARGUMENTS_ENTRYPOINT);
     static_assert(AMS_OFFSETOF(KInitArguments, argument)        == INIT_ARGUMENTS_ARGUMENT);
+    static_assert(AMS_OFFSETOF(KInitArguments, setup_function)  == INIT_ARGUMENTS_SETUP_FUNCTION);
+    static_assert(AMS_OFFSETOF(KInitArguments, exception_stack) == INIT_ARGUMENTS_EXCEPTION_STACK);
 
 }

libraries/libmesosphere/include/mesosphere/arch/arm64/init/kern_k_init_page_table.hpp

@@ -23,6 +23,17 @@
 
 namespace ams::kern::arch::arm64::init {
 
+    inline void ClearPhysicalMemory(KPhysicalAddress address, size_t size) {
+        MESOSPHERE_INIT_ABORT_UNLESS(util::IsAligned(size, sizeof(u64)));
+
+        /* This Physical Address -> void * conversion is valid, because this is init page table code. */
+        /* The MMU is necessarily not yet turned on, if we are creating an initial page table. */
+        volatile u64 *ptr = reinterpret_cast<volatile u64 *>(GetInteger(address));
+        for (size_t i = 0; i < size / sizeof(u64); ++i) {
+            ptr[i] = 0;
+        }
+    }
+
     /* NOTE: Nintendo uses virtual functions, rather than a concept + template. */
     template<typename T>
     concept IsInitialPageAllocator = requires (T &t, KPhysicalAddress phys_addr, size_t size) {
@@ -30,23 +41,25 @@ namespace ams::kern::arch::arm64::init {
         { t.Free(phys_addr, size) } -> std::same_as<void>;
     };
 
-    class KInitialPageTable {
+    template<IsInitialPageAllocator _PageAllocator>
+    class KInitialPageTableTemplate {
+        public:
+            using PageAllocator = _PageAllocator;
         private:
             KPhysicalAddress m_l1_tables[2];
             u32 m_num_entries[2];
         public:
-            template<IsInitialPageAllocator PageAllocator>
-            KInitialPageTable(KVirtualAddress start_address, KVirtualAddress end_address, PageAllocator &allocator) {
+            KInitialPageTableTemplate(KVirtualAddress start_address, KVirtualAddress end_address, PageAllocator &allocator) {
                 /* Set tables. */
-                m_l1_tables[0] = AllocateNewPageTable(allocator, 0);
-                m_l1_tables[1] = AllocateNewPageTable(allocator, 0);
+                m_l1_tables[0] = AllocateNewPageTable(allocator);
+                m_l1_tables[1] = AllocateNewPageTable(allocator);
 
                 /* Set counts. */
                 m_num_entries[0] = MaxPageTableEntries;
                 m_num_entries[1] = ((end_address / L1BlockSize) & (MaxPageTableEntries - 1)) - ((start_address / L1BlockSize) & (MaxPageTableEntries - 1)) + 1;
             }
 
-            KInitialPageTable() {
+            KInitialPageTableTemplate() {
                 /* Set tables. */
                 m_l1_tables[0] = util::AlignDown(cpu::GetTtbr0El1(), PageSize);
                 m_l1_tables[1] = util::AlignDown(cpu::GetTtbr1El1(), PageSize);
@@ -69,35 +82,30 @@ namespace ams::kern::arch::arm64::init {
                 return GetInteger(m_l1_tables[1]);
             }
         private:
-            constexpr ALWAYS_INLINE L1PageTableEntry *GetL1Entry(KVirtualAddress address, u64 phys_to_virt_offset = 0) const {
+            constexpr ALWAYS_INLINE L1PageTableEntry *GetL1Entry(KVirtualAddress address) const {
                 const size_t index = (GetInteger(address) >> (BITSIZEOF(address) - 1)) & 1;
-                L1PageTableEntry *l1_table = reinterpret_cast<L1PageTableEntry *>(GetInteger(m_l1_tables[index]) + phys_to_virt_offset);
+                L1PageTableEntry *l1_table = reinterpret_cast<L1PageTableEntry *>(GetInteger(m_l1_tables[index]));
                 return l1_table + ((GetInteger(address) / L1BlockSize) & (m_num_entries[index] - 1));
             }
 
-            static constexpr ALWAYS_INLINE L2PageTableEntry *GetL2Entry(const L1PageTableEntry *entry, KVirtualAddress address, u64 phys_to_virt_offset = 0) {
-                L2PageTableEntry *l2_table = reinterpret_cast<L2PageTableEntry *>(GetInteger(entry->GetTable()) + phys_to_virt_offset);
+            static constexpr ALWAYS_INLINE L2PageTableEntry *GetL2Entry(const L1PageTableEntry *entry, KVirtualAddress address) {
+                L2PageTableEntry *l2_table = reinterpret_cast<L2PageTableEntry *>(GetInteger(entry->GetTable()));
                 return l2_table + ((GetInteger(address) / L2BlockSize) & (MaxPageTableEntries - 1));
             }
 
-            static constexpr ALWAYS_INLINE L3PageTableEntry *GetL3Entry(const L2PageTableEntry *entry, KVirtualAddress address, u64 phys_to_virt_offset = 0) {
-                L3PageTableEntry *l3_table = reinterpret_cast<L3PageTableEntry *>(GetInteger(entry->GetTable()) + phys_to_virt_offset);
+            static constexpr ALWAYS_INLINE L3PageTableEntry *GetL3Entry(const L2PageTableEntry *entry, KVirtualAddress address) {
+                L3PageTableEntry *l3_table = reinterpret_cast<L3PageTableEntry *>(GetInteger(entry->GetTable()));
                 return l3_table + ((GetInteger(address) / L3BlockSize) & (MaxPageTableEntries - 1));
             }
 
-            template<IsInitialPageAllocator PageAllocator>
-            static ALWAYS_INLINE KPhysicalAddress AllocateNewPageTable(PageAllocator &allocator, u64 phys_to_virt_offset) {
+            static ALWAYS_INLINE KPhysicalAddress AllocateNewPageTable(PageAllocator &allocator) {
                 auto address = allocator.Allocate(PageSize);
-                ClearNewPageTable(address, phys_to_virt_offset);
+                ClearNewPageTable(address);
                 return address;
             }
 
-            static ALWAYS_INLINE void ClearNewPageTable(KPhysicalAddress address, u64 phys_to_virt_offset) {
-                /* Convert to a deferenceable address, and clear. */
-                volatile u64 *ptr = reinterpret_cast<volatile u64 *>(GetInteger(address) + phys_to_virt_offset);
-                for (size_t i = 0; i < PageSize / sizeof(u64); ++i) {
-                    ptr[i] = 0;
-                }
+            static ALWAYS_INLINE void ClearNewPageTable(KPhysicalAddress address) {
+                ClearPhysicalMemory(address, PageSize);
             }
         public:
             static consteval size_t GetMaximumOverheadSize(size_t size) {
@@ -319,8 +327,7 @@ namespace ams::kern::arch::arm64::init {
                 }
             }
         public:
-            template<IsInitialPageAllocator PageAllocator>
-            void NOINLINE Map(KVirtualAddress virt_addr, size_t size, KPhysicalAddress phys_addr, const PageTableEntry &attr, PageAllocator &allocator, u64 phys_to_virt_offset) {
+            void NOINLINE Map(KVirtualAddress virt_addr, size_t size, KPhysicalAddress phys_addr, const PageTableEntry &attr, PageAllocator &allocator) {
                 /* Ensure that addresses and sizes are page aligned. */
                 MESOSPHERE_INIT_ABORT_UNLESS(util::IsAligned(GetInteger(virt_addr),    PageSize));
                 MESOSPHERE_INIT_ABORT_UNLESS(util::IsAligned(GetInteger(phys_addr),    PageSize));
@@ -328,7 +335,7 @@ namespace ams::kern::arch::arm64::init {
 
                 /* Iteratively map pages until the requested region is mapped. */
                 while (size > 0) {
-                    L1PageTableEntry *l1_entry = this->GetL1Entry(virt_addr, phys_to_virt_offset);
+                    L1PageTableEntry *l1_entry = this->GetL1Entry(virt_addr);
 
                     /* Can we make an L1 block? */
                     if (util::IsAligned(GetInteger(virt_addr), L1BlockSize) && util::IsAligned(GetInteger(phys_addr), L1BlockSize) && size >= L1BlockSize) {
@@ -342,12 +349,12 @@ namespace ams::kern::arch::arm64::init {
 
                     /* If we don't already have an L2 table, we need to make a new one. */
                     if (!l1_entry->IsTable()) {
-                        KPhysicalAddress new_table = AllocateNewPageTable(allocator, phys_to_virt_offset);
+                        KPhysicalAddress new_table = AllocateNewPageTable(allocator);
                         cpu::DataSynchronizationBarrierInnerShareable();
                         *l1_entry = L1PageTableEntry(PageTableEntry::TableTag{}, new_table, attr.IsPrivilegedExecuteNever());
                     }
 
-                    L2PageTableEntry *l2_entry = GetL2Entry(l1_entry, virt_addr, phys_to_virt_offset);
+                    L2PageTableEntry *l2_entry = GetL2Entry(l1_entry, virt_addr);
 
                     /* Can we make a contiguous L2 block? */
                     if (util::IsAligned(GetInteger(virt_addr), L2ContiguousBlockSize) && util::IsAligned(GetInteger(phys_addr), L2ContiguousBlockSize) && size >= L2ContiguousBlockSize) {
@@ -373,12 +380,12 @@ namespace ams::kern::arch::arm64::init {
 
                     /* If we don't already have an L3 table, we need to make a new one. */
                     if (!l2_entry->IsTable()) {
-                        KPhysicalAddress new_table = AllocateNewPageTable(allocator, phys_to_virt_offset);
+                        KPhysicalAddress new_table = AllocateNewPageTable(allocator);
                         cpu::DataSynchronizationBarrierInnerShareable();
                         *l2_entry = L2PageTableEntry(PageTableEntry::TableTag{}, new_table, attr.IsPrivilegedExecuteNever());
                     }
 
-                    L3PageTableEntry *l3_entry = GetL3Entry(l2_entry, virt_addr, phys_to_virt_offset);
+                    L3PageTableEntry *l3_entry = GetL3Entry(l2_entry, virt_addr);
 
                     /* Can we make a contiguous L3 block? */
                     if (util::IsAligned(GetInteger(virt_addr), L3ContiguousBlockSize) && util::IsAligned(GetInteger(phys_addr), L3ContiguousBlockSize) && size >= L3ContiguousBlockSize) {
@@ -403,98 +410,6 @@ namespace ams::kern::arch::arm64::init {
                 cpu::DataSynchronizationBarrierInnerShareable();
             }
 
-            void UnmapTtbr0Entries(u64 phys_to_virt_offset) {
-                /* Ensure data consistency before we unmap. */
-                cpu::DataSynchronizationBarrierInnerShareable();
-
-                /* Define helper, as we only want to clear non-nGnRE pages. */
-                constexpr auto ShouldUnmap = [](const PageTableEntry *entry) ALWAYS_INLINE_LAMBDA -> bool {
-                    return entry->GetPageAttribute() != PageTableEntry::PageAttribute_Device_nGnRE;
-                };
-
-                /* Iterate all L1 entries. */
-                L1PageTableEntry * const l1_table = reinterpret_cast<L1PageTableEntry *>(GetInteger(m_l1_tables[0]) + phys_to_virt_offset);
-                for (size_t l1_index = 0; l1_index < m_num_entries[0]; l1_index++) {
-                    /* Get L1 entry. */
-                    L1PageTableEntry * const l1_entry = l1_table + l1_index;
-                    if (l1_entry->IsBlock()) {
-                        /* Unmap the L1 entry, if we should. */
-                        if (ShouldUnmap(l1_entry)) {
-                            *static_cast<PageTableEntry *>(l1_entry) = InvalidPageTableEntry;
-                        }
-                    } else if (l1_entry->IsTable()) {
-                        /* Get the L2 table. */
-                        L2PageTableEntry * const l2_table = reinterpret_cast<L2PageTableEntry *>(GetInteger(l1_entry->GetTable()) + phys_to_virt_offset);
-
-                        /* Unmap all L2 entries, as relevant. */
-                        size_t remaining_l2_entries = 0;
-                        for (size_t l2_index = 0; l2_index < MaxPageTableEntries; ++l2_index) {
-                            /* Get L2 entry. */
-                            L2PageTableEntry * const l2_entry = l2_table + l2_index;
-                            if (l2_entry->IsBlock()) {
-                                const size_t num_to_clear = (l2_entry->IsContiguous() ? L2ContiguousBlockSize : L2BlockSize) / L2BlockSize;
-
-                                if (ShouldUnmap(l2_entry)) {
-                                    for (size_t i = 0; i < num_to_clear; ++i) {
-                                        static_cast<PageTableEntry *>(l2_entry)[i] = InvalidPageTableEntry;
-                                    }
-                                } else {
-                                    remaining_l2_entries += num_to_clear;
-                                }
-
-                                l2_index = l2_index + num_to_clear - 1;
-                            } else if (l2_entry->IsTable()) {
-                                /* Get the L3 table. */
-                                L3PageTableEntry * const l3_table = reinterpret_cast<L3PageTableEntry *>(GetInteger(l2_entry->GetTable()) + phys_to_virt_offset);
-
-                                /* Unmap all L3 entries, as relevant. */
-                                size_t remaining_l3_entries = 0;
-                                for (size_t l3_index = 0; l3_index < MaxPageTableEntries; ++l3_index) {
-                                    /* Get L3 entry. */
-                                    if (L3PageTableEntry * const l3_entry = l3_table + l3_index; l3_entry->IsBlock()) {
-                                        const size_t num_to_clear = (l3_entry->IsContiguous() ? L3ContiguousBlockSize : L3BlockSize) / L3BlockSize;
-
-                                        if (ShouldUnmap(l3_entry)) {
-                                            for (size_t i = 0; i < num_to_clear; ++i) {
-                                                static_cast<PageTableEntry *>(l3_entry)[i] = InvalidPageTableEntry;
-                                            }
-                                        } else {
-                                            remaining_l3_entries += num_to_clear;
-                                        }
-
-                                        l3_index = l3_index + num_to_clear - 1;
-                                    }
-                                }
-
-                                /* If we unmapped all L3 entries, clear the L2 entry. */
-                                if (remaining_l3_entries == 0) {
-                                    *static_cast<PageTableEntry *>(l2_entry) = InvalidPageTableEntry;
-
-                                    /* Invalidate the entire tlb. */
-                                    cpu::DataSynchronizationBarrierInnerShareable();
-                                    cpu::InvalidateEntireTlb();
-                                } else {
-                                    remaining_l2_entries++;
-                                }
-                            }
-                        }
-
-                        /* If we unmapped all L2 entries, clear the L1 entry. */
-                        if (remaining_l2_entries == 0) {
-                            *static_cast<PageTableEntry *>(l1_entry) = InvalidPageTableEntry;
-
-                            /* Invalidate the entire tlb. */
-                            cpu::DataSynchronizationBarrierInnerShareable();
-                            cpu::InvalidateEntireTlb();
-                        }
-                    }
-                }
-
-                /* Invalidate the entire tlb. */
-                cpu::DataSynchronizationBarrierInnerShareable();
-                cpu::InvalidateEntireTlb();
-            }
-
             KPhysicalAddress GetPhysicalAddress(KVirtualAddress virt_addr) const {
                 /* Get the L1 entry. */
                 const L1PageTableEntry *l1_entry = this->GetL1Entry(virt_addr);
@@ -946,4 +861,6 @@ namespace ams::kern::arch::arm64::init {
     };
     static_assert(IsInitialPageAllocator<KInitialPageAllocator>);
 
+    using KInitialPageTable = KInitialPageTableTemplate<KInitialPageAllocator>;
+
 }

libraries/libmesosphere/include/mesosphere/arch/arm64/kern_assembly_offsets.h

@@ -23,7 +23,7 @@
 #define THREAD_KERNEL_STACK_TOP 0x280
 
 /* ams::kern::KThread::StackParameters, https://github.com/Atmosphere-NX/Atmosphere/blob/master/libraries/libmesosphere/include/mesosphere/kern_k_thread.hpp */
-#define THREAD_STACK_PARAMETERS_SIZE                      0x140
+#define THREAD_STACK_PARAMETERS_SIZE                      0x130
 #define THREAD_STACK_PARAMETERS_SVC_PERMISSION            0x00
 #define THREAD_STACK_PARAMETERS_CALLER_SAVE_FPU_REGISTERS 0x18
 #define THREAD_STACK_PARAMETERS_CUR_THREAD                0x20
@@ -34,8 +34,7 @@
 #define THREAD_STACK_PARAMETERS_EXCEPTION_FLAGS           0x2D
 #define THREAD_STACK_PARAMETERS_IS_PINNED                 0x2E
 #define THREAD_STACK_PARAMETERS_RESERVED_2F               0x2F
-#define THREAD_STACK_PARAMETERS_RESERVED_30               0x30
-#define THREAD_STACK_PARAMETERS_THREAD_CONTEXT            0x40
+#define THREAD_STACK_PARAMETERS_THREAD_CONTEXT            0x30
 
 #define THREAD_EXCEPTION_FLAG_BIT_INDEX_IS_CALLING_SVC                    (0)
 #define THREAD_EXCEPTION_FLAG_BIT_INDEX_IS_IN_EXCEPTION_HANDLER           (1)
@@ -246,7 +245,7 @@
 #define THREAD_LOCAL_REGION_SIZE           0x200
 
 /* ams::kern::init::KInitArguments, https://github.com/Atmosphere-NX/Atmosphere/blob/master/libraries/libmesosphere/include/mesosphere/arch/arm64/init/kern_k_init_arguments.hpp */
-#define INIT_ARGUMENTS_SIZE            0x50
+#define INIT_ARGUMENTS_SIZE            0x60
 #define INIT_ARGUMENTS_TTBR0           0x00
 #define INIT_ARGUMENTS_TTBR1           0x08
 #define INIT_ARGUMENTS_TCR             0x10
@@ -257,12 +256,14 @@
 #define INIT_ARGUMENTS_SP              0x38
 #define INIT_ARGUMENTS_ENTRYPOINT      0x40
 #define INIT_ARGUMENTS_ARGUMENT        0x48
+#define INIT_ARGUMENTS_SETUP_FUNCTION  0x50
+#define INIT_ARGUMENTS_EXCEPTION_STACK 0x58
 
 /* ams::kern::KScheduler (::SchedulingState), https://github.com/Atmosphere-NX/Atmosphere/blob/master/libraries/libmesosphere/include/mesosphere/kern_k_scheduler.hpp */
 /* NOTE: Due to constraints on ldarb relative offsets, KSCHEDULER_NEEDS_SCHEDULING cannot trivially be changed, and will require assembly edits. */
 #define KSCHEDULER_NEEDS_SCHEDULING        0x00
 #define KSCHEDULER_INTERRUPT_TASK_RUNNABLE 0x01
-#define KSCHEDULER_HIGHEST_PRIORITY_THREAD 0x18
-#define KSCHEDULER_IDLE_THREAD_STACK       0x20
-#define KSCHEDULER_PREVIOUS_THREAD         0x28
-#define KSCHEDULER_INTERRUPT_TASK_MANAGER  0x30
+#define KSCHEDULER_HIGHEST_PRIORITY_THREAD 0x10
+#define KSCHEDULER_IDLE_THREAD_STACK       0x18
+#define KSCHEDULER_PREVIOUS_THREAD         0x20
+#define KSCHEDULER_INTERRUPT_TASK_MANAGER  0x28

libraries/libmesosphere/include/mesosphere/arch/arm64/kern_cpu.hpp

@@ -36,9 +36,6 @@ namespace ams::kern::arch::arm64::cpu {
     #error "Unknown Board for cpu::NumCores"
 #endif
 
-    constexpr inline u32 El0Aarch64PsrMask = 0xF0000000;
-    constexpr inline u32 El0Aarch32PsrMask = 0xFE0FFE20;
-
     /* Initialization. */
     NOINLINE void InitializeInterruptThreads(s32 core_id);
 
@@ -189,14 +186,6 @@ namespace ams::kern::arch::arm64::cpu {
         return (par >> (BITSIZEOF(par) - BITSIZEOF(u8))) == 0xFF;
     }
 
-    ALWAYS_INLINE void StoreDataCacheForInitArguments(const void *addr, size_t size) {
-        const uintptr_t start = util::AlignDown(reinterpret_cast<uintptr_t>(addr), DataCacheLineSize);
-        for (size_t stored = 0; stored < size; stored += cpu::DataCacheLineSize) {
-            __asm__ __volatile__("dc cvac, %[cur]" :: [cur]"r"(start + stored) : "memory");
-        }
-        DataSynchronizationBarrier();
-    }
-
     /* Synchronization helpers. */
     NOINLINE void SynchronizeAllCores();
     void SynchronizeCores(u64 core_mask);

libraries/libmesosphere/include/mesosphere/arch/arm64/kern_k_page_table.hpp

@@ -178,7 +178,7 @@ namespace ams::kern::arch::arm64 {
             }
 
             NOINLINE Result InitializeForKernel(void *table, KVirtualAddress start, KVirtualAddress end);
-            NOINLINE Result InitializeForProcess(u32 id, ams::svc::CreateProcessFlag as_type, bool enable_aslr, bool enable_das_merge, bool from_back, KMemoryManager::Pool pool, KProcessAddress code_address, size_t code_size, KSystemResource *system_resource, KResourceLimit *resource_limit);
+            NOINLINE Result InitializeForProcess(u32 id, ams::svc::CreateProcessFlag as_type, bool enable_aslr, bool enable_das_merge, bool from_back, KMemoryManager::Pool pool, KProcessAddress code_address, size_t code_size, KMemoryBlockSlabManager *mem_block_slab_manager, KBlockInfoManager *block_info_manager, KPageTableManager *pt_manager, KResourceLimit *resource_limit);
             Result Finalize();
         private:
             Result MapL1Blocks(KProcessAddress virt_addr, KPhysicalAddress phys_addr, size_t num_pages, PageTableEntry entry_template, bool disable_head_merge, PageLinkedList *page_list, bool reuse_ll);
@@ -208,7 +208,7 @@ namespace ams::kern::arch::arm64 {
                 }
             }
 
-            Result MapContiguous(KProcessAddress virt_addr, KPhysicalAddress phys_addr, size_t num_pages, PageTableEntry entry_template, bool disable_head_merge, bool not_first, PageLinkedList *page_list, bool reuse_ll);
+            Result MapContiguous(KProcessAddress virt_addr, KPhysicalAddress phys_addr, size_t num_pages, PageTableEntry entry_template, bool disable_head_merge, PageLinkedList *page_list, bool reuse_ll);
             Result MapGroup(KProcessAddress virt_addr, const KPageGroup &pg, size_t num_pages, PageTableEntry entry_template, bool disable_head_merge, PageLinkedList *page_list, bool reuse_ll);
 
             bool MergePages(KProcessAddress virt_addr, PageLinkedList *page_list);
@@ -216,7 +216,7 @@ namespace ams::kern::arch::arm64 {
             ALWAYS_INLINE Result SeparatePagesImpl(KProcessAddress virt_addr, size_t block_size, PageLinkedList *page_list, bool reuse_ll);
             Result SeparatePages(KProcessAddress virt_addr, size_t block_size, PageLinkedList *page_list, bool reuse_ll);
 
-            Result ChangePermissions(KProcessAddress virt_addr, size_t num_pages, PageTableEntry entry_template, DisableMergeAttribute disable_merge_attr, bool refresh_mapping, bool flush_mapping, PageLinkedList *page_list, bool reuse_ll);
+            Result ChangePermissions(KProcessAddress virt_addr, size_t num_pages, PageTableEntry entry_template, DisableMergeAttribute disable_merge_attr, bool refresh_mapping, PageLinkedList *page_list, bool reuse_ll);
 
             static ALWAYS_INLINE void PteDataMemoryBarrier() {
                 cpu::DataMemoryBarrierInnerShareableStore();

libraries/libmesosphere/include/mesosphere/arch/arm64/kern_k_page_table_entry.hpp

@@ -161,12 +161,9 @@ namespace ams::kern::arch::arm64 {
             constexpr ALWAYS_INLINE bool IsPrivilegedExecuteNever()         const { return this->GetBits(53, 1) != 0; }
             constexpr ALWAYS_INLINE bool IsContiguous()                     const { return this->GetBits(52, 1) != 0; }
             constexpr ALWAYS_INLINE bool IsGlobal()                         const { return this->GetBits(11, 1) == 0; }
-            constexpr ALWAYS_INLINE AccessFlag GetAccessFlag()              const { return static_cast<AccessFlag>(this->SelectBits(10, 1)); }
-            constexpr ALWAYS_INLINE Shareable GetShareable()                const { return static_cast<Shareable>(this->SelectBits(8, 2)); }
-            constexpr ALWAYS_INLINE PageAttribute GetPageAttribute()        const { return static_cast<PageAttribute>(this->SelectBits(2, 3)); }
-            constexpr ALWAYS_INLINE int GetAccessFlagInteger()              const { return static_cast<int>(this->GetBits(10, 1)); }
-            constexpr ALWAYS_INLINE int GetShareableInteger()              const { return static_cast<int>(this->GetBits(8, 2)); }
-            constexpr ALWAYS_INLINE int GetPageAttributeInteger()           const { return static_cast<int>(this->GetBits(2, 3)); }
+            constexpr ALWAYS_INLINE AccessFlag GetAccessFlag()              const { return static_cast<AccessFlag>(this->GetBits(10, 1)); }
+            constexpr ALWAYS_INLINE Shareable GetShareable()                const { return static_cast<Shareable>(this->GetBits(8, 2)); }
+            constexpr ALWAYS_INLINE PageAttribute GetPageAttribute()        const { return static_cast<PageAttribute>(this->GetBits(2, 3)); }
             constexpr ALWAYS_INLINE bool IsReadOnly()                       const { return this->GetBits(7, 1) != 0; }
             constexpr ALWAYS_INLINE bool IsUserAccessible()                 const { return this->GetBits(6, 1) != 0; }
             constexpr ALWAYS_INLINE bool IsNonSecure()                      const { return this->GetBits(5, 1) != 0; }

libraries/libmesosphere/include/mesosphere/arch/arm64/kern_k_process_page_table.hpp

@@ -28,8 +28,8 @@ namespace ams::kern::arch::arm64 {
                 m_page_table.Activate(id);
             }
 
-            Result Initialize(u32 id, ams::svc::CreateProcessFlag as_type, bool enable_aslr, bool enable_das_merge, bool from_back, KMemoryManager::Pool pool, KProcessAddress code_address, size_t code_size, KSystemResource *system_resource, KResourceLimit *resource_limit) {
-                R_RETURN(m_page_table.InitializeForProcess(id, as_type, enable_aslr, enable_das_merge, from_back, pool, code_address, code_size, system_resource, resource_limit));
+            Result Initialize(u32 id, ams::svc::CreateProcessFlag as_type, bool enable_aslr, bool enable_das_merge, bool from_back, KMemoryManager::Pool pool, KProcessAddress code_address, size_t code_size, KMemoryBlockSlabManager *mem_block_slab_manager, KBlockInfoManager *block_info_manager, KPageTableManager *pt_manager, KResourceLimit *resource_limit) {
+                R_RETURN(m_page_table.InitializeForProcess(id, as_type, enable_aslr, enable_das_merge, from_back, pool, code_address, code_size, mem_block_slab_manager, block_info_manager, pt_manager, resource_limit));
             }
 
             void Finalize() { m_page_table.Finalize(); }
@@ -98,8 +98,8 @@ namespace ams::kern::arch::arm64 {
                 R_RETURN(m_page_table.MapIoRegion(dst_address, phys_addr, size, mapping, perm));
             }
 
-            Result UnmapIoRegion(KProcessAddress dst_address, KPhysicalAddress phys_addr, size_t size, ams::svc::MemoryMapping mapping) {
-                R_RETURN(m_page_table.UnmapIoRegion(dst_address, phys_addr, size, mapping));
+            Result UnmapIoRegion(KProcessAddress dst_address, KPhysicalAddress phys_addr, size_t size) {
+                R_RETURN(m_page_table.UnmapIoRegion(dst_address, phys_addr, size));
             }
 
             Result MapStatic(KPhysicalAddress phys_addr, size_t size, KMemoryPermission perm) {
@@ -110,14 +110,6 @@ namespace ams::kern::arch::arm64 {
                 R_RETURN(m_page_table.MapRegion(region_type, perm));
             }
 
-            Result MapInsecureMemory(KProcessAddress address, size_t size) {
-                R_RETURN(m_page_table.MapInsecureMemory(address, size));
-            }
-
-            Result UnmapInsecureMemory(KProcessAddress address, size_t size) {
-                R_RETURN(m_page_table.UnmapInsecureMemory(address, size));
-            }
-
             Result MapPageGroup(KProcessAddress addr, const KPageGroup &pg, KMemoryState state, KMemoryPermission perm) {
                 R_RETURN(m_page_table.MapPageGroup(addr, pg, state, perm));
             }
@@ -166,12 +158,12 @@ namespace ams::kern::arch::arm64 {
                 R_RETURN(m_page_table.WriteDebugIoMemory(address, buffer, size));
             }
 
-            Result LockForMapDeviceAddressSpace(bool *out_is_io, KProcessAddress address, size_t size, KMemoryPermission perm, bool is_aligned, bool check_heap) {
-                R_RETURN(m_page_table.LockForMapDeviceAddressSpace(out_is_io, address, size, perm, is_aligned, check_heap));
+            Result LockForMapDeviceAddressSpace(KProcessAddress address, size_t size, KMemoryPermission perm, bool is_aligned) {
+                R_RETURN(m_page_table.LockForMapDeviceAddressSpace(address, size, perm, is_aligned));
             }
 
-            Result LockForUnmapDeviceAddressSpace(KProcessAddress address, size_t size, bool check_heap) {
-                R_RETURN(m_page_table.LockForUnmapDeviceAddressSpace(address, size, check_heap));
+            Result LockForUnmapDeviceAddressSpace(KProcessAddress address, size_t size) {
+                R_RETURN(m_page_table.LockForUnmapDeviceAddressSpace(address, size));
             }
 
             Result UnlockForDeviceAddressSpace(KProcessAddress address, size_t size) {

libraries/libmesosphere/include/mesosphere/arch/arm64/kern_k_spin_lock.hpp

@@ -77,7 +77,7 @@ namespace ams::kern::arch::arm64 {
                 __asm__ __volatile__(
                     "    prfm   pstl1keep, %[m_next_ticket]\n"
                     "1:\n"
-                    "    ldxrh  %w[tmp0], %[m_next_ticket]\n"
+                    "    ldaxrh %w[tmp0], %[m_next_ticket]\n"
                     "    add    %w[tmp1], %w[tmp0], #0x1\n"
                     "    stxrh  %w[got_lock], %w[tmp1], %[m_next_ticket]\n"
                     "    cbnz   %w[got_lock], 1b\n"

libraries/libmesosphere/include/mesosphere/board/generic/kern_k_device_page_table.hpp

@@ -44,8 +44,8 @@ namespace ams::kern::board::generic {
                 R_THROW(ams::kern::svc::ResultNotImplemented());
             }
 
-            Result ALWAYS_INLINE Map(KProcessPageTable *page_table, KProcessAddress process_address, size_t size, KDeviceVirtualAddress device_address, ams::svc::MemoryPermission device_perm, bool is_aligned, bool is_io) {
-                MESOSPHERE_UNUSED(page_table, process_address, size, device_address, device_perm, is_aligned, is_io);
+            Result ALWAYS_INLINE Map(KProcessPageTable *page_table, KProcessAddress process_address, size_t size, KDeviceVirtualAddress device_address, ams::svc::MemoryPermission device_perm, bool is_aligned) {
+                MESOSPHERE_UNUSED(page_table, process_address, size, device_address, device_perm, is_aligned);
                 R_THROW(ams::kern::svc::ResultNotImplemented());
             }
 

libraries/libmesosphere/include/mesosphere/board/nintendo/nx/kern_k_device_page_table.hpp

@@ -74,7 +74,7 @@ namespace ams::kern::board::nintendo::nx {
             Result Attach(ams::svc::DeviceName device_name, u64 space_address, u64 space_size);
             Result Detach(ams::svc::DeviceName device_name);
 
-            Result Map(KProcessPageTable *page_table, KProcessAddress process_address, size_t size, KDeviceVirtualAddress device_address, ams::svc::MemoryPermission device_perm, bool is_aligned, bool is_io);
+            Result Map(KProcessPageTable *page_table, KProcessAddress process_address, size_t size, KDeviceVirtualAddress device_address, ams::svc::MemoryPermission device_perm, bool is_aligned);
             Result Unmap(KProcessPageTable *page_table, KProcessAddress process_address, size_t size, KDeviceVirtualAddress device_address);
 
             void Unmap(KDeviceVirtualAddress device_address, size_t size) {

libraries/libmesosphere/include/mesosphere/board/nintendo/nx/kern_k_system_control.hpp

@@ -20,20 +20,14 @@
 namespace ams::kern::board::nintendo::nx {
 
     class KSystemControl : public KSystemControlBase {
-        public:
-            /* This can be overridden as needed. */
-            static constexpr size_t SecureAppletMemorySize = 4_MB;
         public:
             class Init : public KSystemControlBase::Init {
-                private:
-                    friend class KSystemControlBase::Init;
-                private:
-                    static void CpuOnImpl(u64 core_id, uintptr_t entrypoint, uintptr_t arg);
                 public:
                     /* Initialization. */
                     static size_t GetRealMemorySize();
                     static size_t GetIntendedMemorySize();
                     static bool ShouldIncreaseThreadResourceLimit();
+                    static void CpuOn(u64 core_id, uintptr_t entrypoint, uintptr_t arg);
                     static size_t GetApplicationPoolSize();
                     static size_t GetAppletPoolSize();
                     static size_t GetMinimumNonSecureSystemPoolSize();

libraries/libmesosphere/include/mesosphere/init/kern_init_arguments_select.hpp

@@ -26,6 +26,6 @@ namespace ams::kern::init {
 
     static_assert(util::IsPowerOfTwo(alignof(KInitArguments)) && util::IsPowerOfTwo(sizeof(KInitArguments)));
 
-    KInitArguments *GetInitArguments(s32 core_id);
+    KPhysicalAddress GetInitArgumentsAddress(s32 core_id);
 
 }

libraries/libmesosphere/include/mesosphere/init/kern_init_slab_setup.hpp

@@ -36,13 +36,13 @@ namespace ams::kern::init {
         size_t num_KDebug;
         size_t num_KIoPool;
         size_t num_KIoRegion;
-        size_t num_KSessionRequestMappings;
     };
 
     NOINLINE void InitializeSlabResourceCounts();
     const KSlabResourceCounts &GetSlabResourceCounts();
 
     size_t CalculateTotalSlabHeapSize();
+    NOINLINE void InitializeKPageBufferSlabHeap();
     NOINLINE void InitializeSlabHeaps();
 
 }

libraries/libmesosphere/include/mesosphere/kern_build_config.hpp

@@ -42,11 +42,6 @@
 #define MESOSPHERE_ENABLE_PANIC_REGISTER_DUMP
 #define MESOSPHERE_ENABLE_HARDWARE_SINGLE_STEP
 
-/* NOTE: In 16.0.0, Nintendo deleted the creation time field for KProcess, */
-/* but this may be useful for some debugging applications, and so can be. */
-/* re-enabled by toggling this define. */
-//#define MESOSPHERE_ENABLE_PROCESS_CREATION_TIME
-
 /* NOTE: This enables fast class token storage using a class member. */
 /* This saves a virtual call when doing KAutoObject->DynCast<>(), */
 /* at the cost of storing class tokens inside the class object. */

libraries/libmesosphere/include/mesosphere/kern_k_address_space_info.hpp

@@ -40,16 +40,12 @@ namespace ams::kern {
             static uintptr_t GetAddressSpaceStart(size_t width, Type type);
             static size_t GetAddressSpaceSize(size_t width, Type type);
 
-            static void SetAddressSpaceSize(size_t width, Type type, size_t size);
-
             constexpr KAddressSpaceInfo(size_t bw, size_t a, size_t s, Type t) : m_bit_width(bw), m_address(a), m_size(s), m_type(t) { /* ... */ }
 
             constexpr size_t GetWidth() const { return m_bit_width; }
             constexpr size_t GetAddress() const { return m_address; }
             constexpr size_t GetSize() const { return m_size; }
             constexpr Type GetType() const { return m_type; }
-
-            constexpr void SetSize(size_t size) { m_size = size; }
     };
 
 }

libraries/libmesosphere/include/mesosphere/kern_k_class_token.hpp

@@ -21,8 +21,6 @@ namespace ams::kern {
 
     class KAutoObject;
 
-    class KSystemResource;
-
     #define FOR_EACH_K_CLASS_TOKEN_OBJECT_TYPE(HANDLER) \
                 HANDLER(KAutoObject)                    \
                                                         \
@@ -50,8 +48,7 @@ namespace ams::kern {
                 HANDLER(KSessionRequest)                \
                 HANDLER(KCodeMemory)                    \
                 HANDLER(KIoPool)                        \
-                HANDLER(KIoRegion)                      \
-                HANDLER(KSystemResource)
+                HANDLER(KIoRegion)
 
     class KClassTokenGenerator {
         public:
@@ -98,7 +95,7 @@ namespace ams::kern {
                 if constexpr (std::is_same<T, KAutoObject>::value) {
                     static_assert(T::ObjectType == ObjectType::KAutoObject);
                     return 0;
-                } else if constexpr (!std::is_final<T>::value && !std::same_as<T, KSystemResource>) {
+                } else if constexpr (!std::is_final<T>::value) {
                     static_assert(ObjectType::BaseClassesStart <= T::ObjectType && T::ObjectType < ObjectType::BaseClassesEnd);
                     constexpr auto ClassIndex = static_cast<TokenBaseType>(T::ObjectType) - static_cast<TokenBaseType>(ObjectType::BaseClassesStart);
                     return BaseClassToken<ClassIndex> | GetClassToken<typename T::BaseClass>();
@@ -145,12 +142,6 @@ namespace ams::kern {
                 KIoPool,
                 KIoRegion,
 
-                /* NOTE: What occupies these gaps? They can be inferred, but they don't make sense. */
-                KAlpha,
-                KBeta,
-
-                KSystemResource,
-
                 FinalClassesLast,
 
                 FinalClassesEnd = FinalClassesStart + NumFinalClasses,
@@ -187,10 +178,8 @@ namespace ams::kern {
             }
 
             for (auto fin = util::ToUnderlying(KClassTokenGenerator::ObjectType::FinalClassesStart); fin < util::ToUnderlying(KClassTokenGenerator::ObjectType::FinalClassesLast); ++fin) {
-                if (const auto o = static_cast<KClassTokenGenerator::ObjectType>(fin); !IsObjectTypeIncludedByMacro(o)) {
-                    if (o != KClassTokenGenerator::ObjectType::KAlpha && o != KClassTokenGenerator::ObjectType::KBeta) {
-                        return false;
-                    }
+                if (!IsObjectTypeIncludedByMacro(static_cast<KClassTokenGenerator::ObjectType>(fin))) {
+                    return false;
                 }
             }
 

libraries/libmesosphere/include/mesosphere/kern_k_debug_base.hpp

@@ -74,7 +74,7 @@ namespace ams::kern {
                 return m_process_holder.Get();
             }
         private:
-            void PushDebugEvent(ams::svc::DebugEvent event, const uintptr_t *params, size_t num_params);
+            void PushDebugEvent(ams::svc::DebugEvent event, uintptr_t param0 = 0, uintptr_t param1 = 0, uintptr_t param2 = 0, uintptr_t param3 = 0, uintptr_t param4 = 0);
             void EnqueueDebugEventInfo(KEventInfo *info);
 
             template<typename T> requires (std::same_as<T, ams::svc::lp64::DebugEventInfo> || std::same_as<T, ams::svc::ilp32::DebugEventInfo>)
@@ -85,13 +85,13 @@ namespace ams::kern {
             /* NOTE: This is public/virtual override in Nintendo's kernel. */
             void OnFinalizeSynchronizationObject();
         private:
-            static Result ProcessDebugEvent(ams::svc::DebugEvent event, const uintptr_t *params, size_t num_params);
+            static Result ProcessDebugEvent(ams::svc::DebugEvent event, uintptr_t param0, uintptr_t param1, uintptr_t param2, uintptr_t param3, uintptr_t param4);
         public:
-            static Result OnDebugEvent(ams::svc::DebugEvent event, const uintptr_t *params, size_t num_params);
+            static Result OnDebugEvent(ams::svc::DebugEvent event, uintptr_t param0 = 0, uintptr_t param1 = 0, uintptr_t param2 = 0, uintptr_t param3 = 0, uintptr_t param4 = 0);
             static Result OnExitProcess(KProcess *process);
             static Result OnTerminateProcess(KProcess *process);
             static Result OnExitThread(KThread *thread);
-            static KEventInfo *CreateDebugEvent(ams::svc::DebugEvent event, u64 thread_id, const uintptr_t *params, size_t num_params);
+            static KEventInfo *CreateDebugEvent(ams::svc::DebugEvent event, uintptr_t param0, uintptr_t param1, uintptr_t param2, uintptr_t param3, uintptr_t param4, u64 thread_id);
     };
 
 }

libraries/libmesosphere/include/mesosphere/kern_k_device_address_space.hpp

@@ -41,17 +41,17 @@ namespace ams::kern {
             Result Attach(ams::svc::DeviceName device_name);
             Result Detach(ams::svc::DeviceName device_name);
 
-            Result MapByForce(KProcessPageTable *page_table, KProcessAddress process_address, size_t size, u64 device_address, u32 option) {
-                R_RETURN(this->Map(page_table, process_address, size, device_address, option, false));
+            Result MapByForce(KProcessPageTable *page_table, KProcessAddress process_address, size_t size, u64 device_address, ams::svc::MemoryPermission device_perm) {
+                R_RETURN(this->Map(page_table, process_address, size, device_address, device_perm, false));
             }
 
-            Result MapAligned(KProcessPageTable *page_table, KProcessAddress process_address, size_t size, u64 device_address, u32 option) {
-                R_RETURN(this->Map(page_table, process_address, size, device_address, option, true));
+            Result MapAligned(KProcessPageTable *page_table, KProcessAddress process_address, size_t size, u64 device_address, ams::svc::MemoryPermission device_perm) {
+                R_RETURN(this->Map(page_table, process_address, size, device_address, device_perm, true));
             }
 
             Result Unmap(KProcessPageTable *page_table, KProcessAddress process_address, size_t size, u64 device_address);
         private:
-            Result Map(KProcessPageTable *page_table, KProcessAddress process_address, size_t size, u64 device_address, u32 option, bool is_aligned);
+            Result Map(KProcessPageTable *page_table, KProcessAddress process_address, size_t size, u64 device_address, ams::svc::MemoryPermission device_perm, bool is_aligned);
         public:
             static void Initialize();
     };

libraries/libmesosphere/include/mesosphere/kern_k_dynamic_page_manager.hpp

@@ -38,37 +38,30 @@ namespace ams::kern {
             size_t m_peak;
             size_t m_count;
             KVirtualAddress m_address;
-            KVirtualAddress m_aligned_address;
             size_t m_size;
         public:
-            KDynamicPageManager() : m_lock(), m_page_bitmap(), m_used(), m_peak(), m_count(), m_address(Null<KVirtualAddress>), m_aligned_address(Null<KVirtualAddress>), m_size() { /* ... */ }
+            KDynamicPageManager() : m_lock(), m_page_bitmap(), m_used(), m_peak(), m_count(), m_address(Null<KVirtualAddress>), m_size() { /* ... */ }
 
-            Result Initialize(KVirtualAddress memory, size_t size, size_t align) {
+            Result Initialize(KVirtualAddress memory, size_t sz) {
                 /* We need to have positive size. */
-                R_UNLESS(size > 0, svc::ResultOutOfMemory());
+                R_UNLESS(sz > 0, svc::ResultOutOfMemory());
 
-                /* Set addresses. */
-                m_address         = memory;
-                m_aligned_address = util::AlignDown(GetInteger(memory), align);
-
-                /* Calculate extents. */
-                const size_t managed_size  = m_address + size - m_aligned_address;
-                const size_t overhead_size = util::AlignUp(KPageBitmap::CalculateManagementOverheadSize(managed_size / sizeof(PageBuffer)), sizeof(PageBuffer));
-                R_UNLESS(overhead_size < size, svc::ResultOutOfMemory());
+                /* Calculate management overhead. */
+                const size_t management_size  = KPageBitmap::CalculateManagementOverheadSize(sz / sizeof(PageBuffer));
+                const size_t allocatable_size = sz - management_size;
 
                 /* Set tracking fields. */
-                m_size  = util::AlignDown(size - overhead_size, sizeof(PageBuffer));
-                m_count = m_size / sizeof(PageBuffer);
+                m_address = memory;
+                m_size    = util::AlignDown(allocatable_size, sizeof(PageBuffer));
+                m_count   = allocatable_size / sizeof(PageBuffer);
+                R_UNLESS(m_count > 0, svc::ResultOutOfMemory());
 
                 /* Clear the management region. */
-                u64 *management_ptr = GetPointer<u64>(m_address + size - overhead_size);
-                std::memset(management_ptr, 0, overhead_size);
+                u64 *management_ptr = GetPointer<u64>(m_address + allocatable_size);
+                std::memset(management_ptr, 0, management_size);
 
                 /* Initialize the bitmap. */
-                const size_t allocatable_region_size = (GetInteger(m_address) + size - overhead_size) - GetInteger(m_aligned_address);
-                MESOSPHERE_ABORT_UNLESS(allocatable_region_size >= sizeof(PageBuffer));
-
-                m_page_bitmap.Initialize(management_ptr, allocatable_region_size / sizeof(PageBuffer));
+                m_page_bitmap.Initialize(management_ptr, m_count);
 
                 /* Free the pages to the bitmap. */
                 for (size_t i = 0; i < m_count; i++) {
@@ -76,7 +69,7 @@ namespace ams::kern {
                     cpu::ClearPageToZero(GetPointer<PageBuffer>(m_address) + i);
 
                     /* Set the bit for the free page. */
-                    m_page_bitmap.SetBit((GetInteger(m_address) + (i * sizeof(PageBuffer)) - GetInteger(m_aligned_address)) / sizeof(PageBuffer));
+                    m_page_bitmap.SetBit(i);
                 }
 
                 R_SUCCEED();
@@ -105,28 +98,7 @@ namespace ams::kern {
                 m_page_bitmap.ClearBit(offset);
                 m_peak = std::max(m_peak, (++m_used));
 
-                return GetPointer<PageBuffer>(m_aligned_address) + offset;
-            }
-
-            PageBuffer *Allocate(size_t count) {
-                /* Take the lock. */
-                KScopedInterruptDisable di;
-                KScopedSpinLock lk(m_lock);
-
-                /* Find a random free block. */
-                ssize_t soffset = m_page_bitmap.FindFreeRange(count);
-                if (AMS_UNLIKELY(soffset < 0)) {
-                    return nullptr;
-                }
-
-                const size_t offset = static_cast<size_t>(soffset);
-
-                /* Update our tracking. */
-                m_page_bitmap.ClearRange(offset, count);
-                m_used += count;
-                m_peak = std::max(m_peak, m_used);
-
-                return GetPointer<PageBuffer>(m_aligned_address) + offset;
+                return GetPointer<PageBuffer>(m_address) + offset;
             }
 
             void Free(PageBuffer *pb) {
@@ -138,7 +110,7 @@ namespace ams::kern {
                 KScopedSpinLock lk(m_lock);
 
                 /* Set the bit for the free page. */
-                size_t offset = (reinterpret_cast<uintptr_t>(pb) - GetInteger(m_aligned_address)) / sizeof(PageBuffer);
+                size_t offset = (reinterpret_cast<uintptr_t>(pb) - GetInteger(m_address)) / sizeof(PageBuffer);
                 m_page_bitmap.SetBit(offset);
 
                 /* Decrement our used count. */

libraries/libmesosphere/include/mesosphere/kern_k_event_info.hpp

@@ -38,7 +38,7 @@ namespace ams::kern {
                 ams::svc::DebugException exception_type;
                 s32 exception_data_count;
                 uintptr_t exception_address;
-                uintptr_t exception_data[std::max<size_t>(4, cpu::NumCores)];
+                uintptr_t exception_data[4];
             };
 
             struct InfoSystemCall {

libraries/libmesosphere/include/mesosphere/kern_k_handle_table.hpp

@@ -70,20 +70,15 @@ namespace ams::kern {
             u16 m_next_linear_id;
             u16 m_count;
         public:
-            constexpr explicit KHandleTable(util::ConstantInitializeTag) : m_entry_infos(), m_objects(), m_lock(), m_free_head_index(-1), m_table_size(), m_max_count(), m_next_linear_id(), m_count() { /* ... */ }
+            constexpr explicit KHandleTable(util::ConstantInitializeTag) : m_entry_infos(), m_objects(), m_lock(), m_free_head_index(-1), m_table_size(), m_max_count(), m_next_linear_id(MinLinearId), m_count() { /* ... */ }
 
-            explicit KHandleTable() : m_lock(), m_free_head_index(-1), m_table_size(), m_max_count(), m_next_linear_id(), m_count() { MESOSPHERE_ASSERT_THIS(); }
+            explicit KHandleTable() : m_lock(), m_free_head_index(-1), m_count() { MESOSPHERE_ASSERT_THIS(); }
 
-            MESOSPHERE_NOINLINE_IF_DEBUG Result Initialize(s32 size) {
+            constexpr MESOSPHERE_NOINLINE_IF_DEBUG Result Initialize(s32 size) {
                 MESOSPHERE_ASSERT_THIS();
 
-                /* Check that the table size is valid. */
                 R_UNLESS(size <= static_cast<s32>(MaxTableSize), svc::ResultOutOfMemory());
 
-                /* Lock. */
-                KScopedDisableDispatch dd;
-                KScopedSpinLock lk(m_lock);
-
                 /* Initialize all fields. */
                 m_max_count       = 0;
                 m_table_size      = (size <= 0) ? MaxTableSize : size;

libraries/libmesosphere/include/mesosphere/kern_k_interrupt_event.hpp

@@ -22,7 +22,9 @@
 
 namespace ams::kern {
 
-    class KInterruptEvent final : public KAutoObjectWithSlabHeapAndContainer<KInterruptEvent, KReadableEvent>, public KInterruptTask {
+    class KInterruptEventTask;
+
+    class KInterruptEvent final : public KAutoObjectWithSlabHeapAndContainer<KInterruptEvent, KReadableEvent> {
         MESOSPHERE_AUTOOBJECT_TRAITS(KInterruptEvent, KReadableEvent);
         private:
             s32 m_interrupt_id;
@@ -52,9 +54,21 @@ namespace ams::kern {
             static void PostDestroy(uintptr_t arg) { MESOSPHERE_UNUSED(arg); /* ... */ }
 
             constexpr s32 GetInterruptId() const { return m_interrupt_id; }
+    };
+
+    class KInterruptEventTask : public KSlabAllocated<KInterruptEventTask>, public KInterruptTask {
+        private:
+            KInterruptEvent *m_event;
+        public:
+            constexpr KInterruptEventTask() : m_event(nullptr) { /* ... */ }
+            ~KInterruptEventTask() { /* ... */ }
 
             virtual KInterruptTask *OnInterrupt(s32 interrupt_id) override;
             virtual void DoTask() override;
+
+            void Unregister(s32 interrupt_id, s32 core_id);
+        public:
+            static Result Register(s32 interrupt_id, s32 core_id, bool level, KInterruptEvent *event);
     };
 
 }

libraries/libmesosphere/include/mesosphere/kern_k_io_pool.hpp

@@ -24,10 +24,10 @@ namespace ams::kern {
     class KIoPool final : public KAutoObjectWithSlabHeapAndContainer<KIoPool, KAutoObjectWithList> {
         MESOSPHERE_AUTOOBJECT_TRAITS(KIoPool, KAutoObject);
         private:
-            using IoRegionTree = util::IntrusiveRedBlackTreeBaseTraits<KIoRegion>::TreeType<KIoRegion>;
+            using IoRegionList = util::IntrusiveListMemberTraits<&KIoRegion::m_pool_list_node>::ListType;
         private:
             KLightLock m_lock;
-            IoRegionTree m_io_region_tree;
+            IoRegionList m_io_region_list;
             ams::svc::IoPoolType m_pool_type;
             bool m_is_initialized;
         public:

libraries/libmesosphere/include/mesosphere/kern_k_io_region.hpp

@@ -23,30 +23,11 @@ namespace ams::kern {
     class KProcess;
     class KIoPool;
 
-    class KIoRegion final : public KAutoObjectWithSlabHeapAndContainer<KIoRegion, KAutoObjectWithList>, public util::IntrusiveRedBlackTreeBaseNode<KIoRegion> {
+    class KIoRegion final : public KAutoObjectWithSlabHeapAndContainer<KIoRegion, KAutoObjectWithList> {
         MESOSPHERE_AUTOOBJECT_TRAITS(KIoRegion, KAutoObject);
         private:
             friend class KProcess;
             friend class KIoPool;
-        public:
-            using RedBlackKeyType = KPhysicalAddress;
-
-            static constexpr ALWAYS_INLINE RedBlackKeyType GetRedBlackKey(const RedBlackKeyType  &v) { return v; }
-            static constexpr ALWAYS_INLINE RedBlackKeyType GetRedBlackKey(const KIoRegion &v) { return v.GetAddress(); }
-
-            template<typename T> requires (std::same_as<T, KIoRegion> || std::same_as<T, RedBlackKeyType>)
-            static constexpr ALWAYS_INLINE int Compare(const T &lhs, const KIoRegion &rhs) {
-                const RedBlackKeyType lval = GetRedBlackKey(lhs);
-                const RedBlackKeyType rval = GetRedBlackKey(rhs);
-
-                if (lval < rval) {
-                    return -1;
-                } else if (lval == rval) {
-                    return 0;
-                } else {
-                    return 1;
-                }
-            }
         private:
             KLightLock m_lock;
             KIoPool *m_pool;
@@ -57,6 +38,7 @@ namespace ams::kern {
             bool m_is_initialized;
             bool m_is_mapped;
             util::IntrusiveListNode m_process_list_node;
+            util::IntrusiveListNode m_pool_list_node;
         public:
             explicit KIoRegion() : m_pool(nullptr), m_is_initialized(false) { /* ... */ }
 
@@ -69,25 +51,12 @@ namespace ams::kern {
             Result Map(KProcessAddress address, size_t size, ams::svc::MemoryPermission map_perm);
             Result Unmap(KProcessAddress address, size_t size);
 
-            constexpr bool Overlaps(KPhysicalAddress address, size_t size) const {
+            bool Overlaps(KPhysicalAddress address, size_t size) const {
                 return m_physical_address <= (address + size - 1) && address <= (m_physical_address + m_size - 1);
             }
 
-            constexpr ALWAYS_INLINE KPhysicalAddress GetAddress() const { return m_physical_address; }
-            constexpr ALWAYS_INLINE size_t GetSize() const { return m_size; }
-
-            constexpr uintptr_t GetHint() const {
-                /* TODO: Is this architecture specific? */
-                if (m_size >= 2_MB) {
-                    return GetInteger(m_physical_address) & (2_MB - 1);
-                } else if (m_size >= 64_KB) {
-                    return GetInteger(m_physical_address) & (64_KB - 1);
-                } else if (m_size >= 4_KB) {
-                    return GetInteger(m_physical_address) & (4_KB - 1);
-                } else {
-                    return 0;
-                }
-            }
+            ALWAYS_INLINE KPhysicalAddress GetAddress() const { return m_physical_address; }
+            ALWAYS_INLINE size_t GetSize() const { return m_size; }
     };
 
 }

libraries/libmesosphere/include/mesosphere/kern_k_memory_block.hpp

@@ -43,7 +43,6 @@ namespace ams::kern {
         KMemoryState_FlagCanMapProcess          = (1 << 23),
         KMemoryState_FlagCanChangeAttribute     = (1 << 24),
         KMemoryState_FlagCanCodeMemory          = (1 << 25),
-        KMemoryState_FlagLinearMapped           = (1 << 26),
 
         KMemoryState_FlagsData = KMemoryState_FlagCanReprotect          | KMemoryState_FlagCanUseIpc            |
                                  KMemoryState_FlagCanUseNonDeviceIpc    | KMemoryState_FlagCanUseNonSecureIpc   |
@@ -51,27 +50,25 @@ namespace ams::kern {
                                  KMemoryState_FlagCanTransfer           | KMemoryState_FlagCanQueryPhysical     |
                                  KMemoryState_FlagCanDeviceMap          | KMemoryState_FlagCanAlignedDeviceMap  |
                                  KMemoryState_FlagCanIpcUserBuffer      | KMemoryState_FlagReferenceCounted     |
-                                 KMemoryState_FlagCanChangeAttribute    | KMemoryState_FlagLinearMapped,
+                                 KMemoryState_FlagCanChangeAttribute,
 
         KMemoryState_FlagsCode = KMemoryState_FlagCanDebug              | KMemoryState_FlagCanUseIpc            |
                                  KMemoryState_FlagCanUseNonDeviceIpc    | KMemoryState_FlagCanUseNonSecureIpc   |
                                  KMemoryState_FlagMapped                | KMemoryState_FlagCode                 |
                                  KMemoryState_FlagCanQueryPhysical      | KMemoryState_FlagCanDeviceMap         |
-                                 KMemoryState_FlagCanAlignedDeviceMap   | KMemoryState_FlagReferenceCounted     |
-                                 KMemoryState_FlagLinearMapped,
+                                 KMemoryState_FlagCanAlignedDeviceMap   | KMemoryState_FlagReferenceCounted,
 
         KMemoryState_FlagsMisc = KMemoryState_FlagMapped                | KMemoryState_FlagReferenceCounted     |
-                                 KMemoryState_FlagCanQueryPhysical      | KMemoryState_FlagCanDeviceMap         |
-                                 KMemoryState_FlagLinearMapped,
+                                 KMemoryState_FlagCanQueryPhysical      | KMemoryState_FlagCanDeviceMap,
 
 
         KMemoryState_Free               = ams::svc::MemoryState_Free,
-        KMemoryState_Io                 = ams::svc::MemoryState_Io                  | KMemoryState_FlagMapped | KMemoryState_FlagCanDeviceMap        | KMemoryState_FlagCanAlignedDeviceMap,
+        KMemoryState_Io                 = ams::svc::MemoryState_Io                  | KMemoryState_FlagMapped,
         KMemoryState_Static             = ams::svc::MemoryState_Static              | KMemoryState_FlagMapped | KMemoryState_FlagCanQueryPhysical,
         KMemoryState_Code               = ams::svc::MemoryState_Code                | KMemoryState_FlagsCode  | KMemoryState_FlagCanMapProcess,
         KMemoryState_CodeData           = ams::svc::MemoryState_CodeData            | KMemoryState_FlagsData  | KMemoryState_FlagCanMapProcess       | KMemoryState_FlagCanCodeMemory,
         KMemoryState_Normal             = ams::svc::MemoryState_Normal              | KMemoryState_FlagsData  | KMemoryState_FlagCanCodeMemory,
-        KMemoryState_Shared             = ams::svc::MemoryState_Shared              | KMemoryState_FlagMapped | KMemoryState_FlagReferenceCounted    | KMemoryState_FlagLinearMapped,
+        KMemoryState_Shared             = ams::svc::MemoryState_Shared              | KMemoryState_FlagMapped | KMemoryState_FlagReferenceCounted,
 
         /* KMemoryState_Alias was removed after 1.0.0. */
 
@@ -85,7 +82,7 @@ namespace ams::kern {
         KMemoryState_Stack              = ams::svc::MemoryState_Stack               | KMemoryState_FlagsMisc  | KMemoryState_FlagCanAlignedDeviceMap
                                                                                                               | KMemoryState_FlagCanUseIpc           | KMemoryState_FlagCanUseNonSecureIpc | KMemoryState_FlagCanUseNonDeviceIpc,
 
-        KMemoryState_ThreadLocal        = ams::svc::MemoryState_ThreadLocal         | KMemoryState_FlagMapped | KMemoryState_FlagLinearMapped,
+        KMemoryState_ThreadLocal        = ams::svc::MemoryState_ThreadLocal         | KMemoryState_FlagMapped | KMemoryState_FlagReferenceCounted,
 
         KMemoryState_Transfered         = ams::svc::MemoryState_Transfered          | KMemoryState_FlagsMisc  | KMemoryState_FlagCanAlignedDeviceMap | KMemoryState_FlagCanChangeAttribute
                                                                                                               | KMemoryState_FlagCanUseIpc           | KMemoryState_FlagCanUseNonSecureIpc | KMemoryState_FlagCanUseNonDeviceIpc,
@@ -93,7 +90,7 @@ namespace ams::kern {
         KMemoryState_SharedTransfered   = ams::svc::MemoryState_SharedTransfered    | KMemoryState_FlagsMisc  | KMemoryState_FlagCanAlignedDeviceMap
                                                                                                               | KMemoryState_FlagCanUseNonSecureIpc  | KMemoryState_FlagCanUseNonDeviceIpc,
 
-        KMemoryState_SharedCode         = ams::svc::MemoryState_SharedCode          | KMemoryState_FlagMapped | KMemoryState_FlagReferenceCounted    | KMemoryState_FlagLinearMapped
+        KMemoryState_SharedCode         = ams::svc::MemoryState_SharedCode          | KMemoryState_FlagMapped | KMemoryState_FlagReferenceCounted
                                                                                                               | KMemoryState_FlagCanUseNonSecureIpc  | KMemoryState_FlagCanUseNonDeviceIpc,
 
         KMemoryState_Inaccessible       = ams::svc::MemoryState_Inaccessible,
@@ -106,41 +103,36 @@ namespace ams::kern {
 
         KMemoryState_Kernel             = ams::svc::MemoryState_Kernel              | KMemoryState_FlagMapped,
 
-        KMemoryState_GeneratedCode      = ams::svc::MemoryState_GeneratedCode       | KMemoryState_FlagMapped | KMemoryState_FlagReferenceCounted    | KMemoryState_FlagCanDebug           | KMemoryState_FlagLinearMapped,
-        KMemoryState_CodeOut            = ams::svc::MemoryState_CodeOut             | KMemoryState_FlagMapped | KMemoryState_FlagReferenceCounted    | KMemoryState_FlagLinearMapped,
+        KMemoryState_GeneratedCode      = ams::svc::MemoryState_GeneratedCode       | KMemoryState_FlagMapped | KMemoryState_FlagReferenceCounted    | KMemoryState_FlagCanDebug,
+        KMemoryState_CodeOut            = ams::svc::MemoryState_CodeOut             | KMemoryState_FlagMapped | KMemoryState_FlagReferenceCounted,
 
         KMemoryState_Coverage           = ams::svc::MemoryState_Coverage            | KMemoryState_FlagMapped,
-
-        KMemoryState_Insecure           = ams::svc::MemoryState_Insecure            | KMemoryState_FlagMapped | KMemoryState_FlagReferenceCounted    | KMemoryState_FlagLinearMapped       | KMemoryState_FlagCanChangeAttribute
-                                                                                                              | KMemoryState_FlagCanDeviceMap        | KMemoryState_FlagCanAlignedDeviceMap
-                                                                                                              | KMemoryState_FlagCanUseNonSecureIpc  | KMemoryState_FlagCanUseNonDeviceIpc,
     };
 
 #if 1
     static_assert(KMemoryState_Free             == 0x00000000);
-    static_assert(KMemoryState_Io               == 0x00182001);
+    static_assert(KMemoryState_Io               == 0x00002001);
     static_assert(KMemoryState_Static           == 0x00042002);
-    static_assert(KMemoryState_Code             == 0x04DC7E03);
-    static_assert(KMemoryState_CodeData         == 0x07FEBD04);
-    static_assert(KMemoryState_Normal           == 0x077EBD05);
-    static_assert(KMemoryState_Shared           == 0x04402006);
+    static_assert(KMemoryState_Code             == 0x00DC7E03);
+    static_assert(KMemoryState_CodeData         == 0x03FEBD04);
+    static_assert(KMemoryState_Normal           == 0x037EBD05);
+    static_assert(KMemoryState_Shared           == 0x00402006);
 
-    static_assert(KMemoryState_AliasCode        == 0x04DD7E08);
-    static_assert(KMemoryState_AliasCodeData    == 0x07FFBD09);
-    static_assert(KMemoryState_Ipc              == 0x045C3C0A);
-    static_assert(KMemoryState_Stack            == 0x045C3C0B);
-    static_assert(KMemoryState_ThreadLocal      == 0x0400200C);
-    static_assert(KMemoryState_Transfered       == 0x055C3C0D);
-    static_assert(KMemoryState_SharedTransfered == 0x045C380E);
-    static_assert(KMemoryState_SharedCode       == 0x0440380F);
+    static_assert(KMemoryState_AliasCode        == 0x00DD7E08);
+    static_assert(KMemoryState_AliasCodeData    == 0x03FFBD09);
+    static_assert(KMemoryState_Ipc              == 0x005C3C0A);
+    static_assert(KMemoryState_Stack            == 0x005C3C0B);
+    static_assert(KMemoryState_ThreadLocal      == 0x0040200C);
+    static_assert(KMemoryState_Transfered       == 0x015C3C0D);
+    static_assert(KMemoryState_SharedTransfered == 0x005C380E);
+    static_assert(KMemoryState_SharedCode       == 0x0040380F);
     static_assert(KMemoryState_Inaccessible     == 0x00000010);
-    static_assert(KMemoryState_NonSecureIpc     == 0x045C3811);
-    static_assert(KMemoryState_NonDeviceIpc     == 0x044C2812);
+    static_assert(KMemoryState_NonSecureIpc     == 0x005C3811);
+    static_assert(KMemoryState_NonDeviceIpc     == 0x004C2812);
     static_assert(KMemoryState_Kernel           == 0x00002013);
-    static_assert(KMemoryState_GeneratedCode    == 0x04402214);
-    static_assert(KMemoryState_CodeOut          == 0x04402015);
+    static_assert(KMemoryState_GeneratedCode    == 0x00402214);
+    static_assert(KMemoryState_CodeOut          == 0x00402015);
     static_assert(KMemoryState_Coverage         == 0x00002016);
-    static_assert(KMemoryState_Insecure         == 0x05583817);
 #endif
 
     enum KMemoryPermission : u8 {

libraries/libmesosphere/include/mesosphere/kern_k_memory_layout.hpp

@@ -50,11 +50,9 @@ namespace ams::kern {
     constexpr size_t KernelSlabHeapSize               = KernelSlabHeapDataSize + KernelSlabHeapGapsSizeMax;
 
     /* NOTE: This is calculated from KThread slab counts, assuming KThread size <= 0x800. */
-    constexpr size_t KernelPageBufferHeapSize         = 0x3E0000;
     constexpr size_t KernelSlabHeapAdditionalSize     = 0x148000;
-    constexpr size_t KernelPageBufferAdditionalSize   = 0x33C000;
 
-    constexpr size_t KernelResourceSize               = KernelPageTableHeapSize + KernelInitialPageHeapSize + KernelSlabHeapSize + KernelPageBufferHeapSize;
+    constexpr size_t KernelResourceSize               = KernelPageTableHeapSize + KernelInitialPageHeapSize + KernelSlabHeapSize;
 
     class KMemoryLayout {
         private:
@@ -152,8 +150,6 @@ namespace ams::kern {
 
             static MESOSPHERE_NOINLINE_IF_DEBUG const KMemoryRegion &GetKernelTraceBufferRegion() { return Dereference(GetVirtualLinearMemoryRegionTree().FindByType(KMemoryRegionType_VirtualDramKernelTraceBuffer)); }
 
-            static MESOSPHERE_NOINLINE_IF_DEBUG const KMemoryRegion &GetSecureAppletMemoryRegion() { return Dereference(GetVirtualMemoryRegionTree().FindByType(KMemoryRegionType_VirtualDramKernelSecureAppletMemory)); }
-
             static MESOSPHERE_NOINLINE_IF_DEBUG const KMemoryRegion &GetVirtualLinearRegion(KVirtualAddress address) { return Dereference(FindLinear(address)); }
             static MESOSPHERE_NOINLINE_IF_DEBUG const KMemoryRegion &GetPhysicalLinearRegion(KPhysicalAddress address) { return Dereference(FindLinear(address)); }
 
@@ -183,15 +179,15 @@ namespace ams::kern {
                 return std::make_tuple(total_size, kernel_size);
             }
 
-            static void InitializeLinearMemoryAddresses(u64 phys_to_virt_diff) {
+            static void InitializeLinearMemoryAddresses(KPhysicalAddress aligned_linear_phys_start, KVirtualAddress linear_virtual_start) {
                 /* Set static differences. */
-                s_linear_phys_to_virt_diff =  phys_to_virt_diff;
-                s_linear_virt_to_phys_diff = -phys_to_virt_diff;
+                s_linear_phys_to_virt_diff = GetInteger(linear_virtual_start) - GetInteger(aligned_linear_phys_start);
+                s_linear_virt_to_phys_diff = GetInteger(aligned_linear_phys_start) - GetInteger(linear_virtual_start);
             }
 
             static void InitializeLinearMemoryRegionTrees();
 
-            static size_t GetResourceRegionSizeForInit(bool use_extra_resource);
+            static size_t GetResourceRegionSizeForInit();
 
             static MESOSPHERE_NOINLINE_IF_DEBUG auto GetKernelRegionExtents()      { return GetVirtualMemoryRegionTree().GetDerivedRegionExtents(KMemoryRegionType_Kernel); }
             static MESOSPHERE_NOINLINE_IF_DEBUG auto GetKernelCodeRegionExtents()  { return GetVirtualMemoryRegionTree().GetDerivedRegionExtents(KMemoryRegionType_KernelCode); }
@@ -213,7 +209,6 @@ namespace ams::kern {
             static MESOSPHERE_NOINLINE_IF_DEBUG auto GetKernelRegionPhysicalExtents() { return GetPhysicalMemoryRegionTree().GetDerivedRegionExtents(KMemoryRegionType_DramKernelBase); }
             static MESOSPHERE_NOINLINE_IF_DEBUG auto GetKernelCodeRegionPhysicalExtents() { return GetPhysicalMemoryRegionTree().GetDerivedRegionExtents(KMemoryRegionType_DramKernelCode); }
             static MESOSPHERE_NOINLINE_IF_DEBUG auto GetKernelSlabRegionPhysicalExtents() { return GetPhysicalMemoryRegionTree().GetDerivedRegionExtents(KMemoryRegionType_DramKernelSlab); }
-            static MESOSPHERE_NOINLINE_IF_DEBUG auto GetKernelSecureAppletMemoryRegionPhysicalExtents() { return GetPhysicalMemoryRegionTree().GetDerivedRegionExtents(KMemoryRegionType_DramKernelSecureAppletMemory); }
             static MESOSPHERE_NOINLINE_IF_DEBUG auto GetKernelPageTableHeapRegionPhysicalExtents() { return GetPhysicalMemoryRegionTree().GetDerivedRegionExtents(KMemoryRegionType_DramKernelPtHeap); }
             static MESOSPHERE_NOINLINE_IF_DEBUG auto GetKernelInitPageTableRegionPhysicalExtents() { return GetPhysicalMemoryRegionTree().GetDerivedRegionExtents(KMemoryRegionType_DramKernelInitPt); }
 

libraries/libmesosphere/include/mesosphere/kern_k_memory_manager.hpp

@@ -200,7 +200,7 @@ namespace ams::kern {
 
             NOINLINE KPhysicalAddress AllocateAndOpenContinuous(size_t num_pages, size_t align_pages, u32 option);
             NOINLINE Result AllocateAndOpen(KPageGroup *out, size_t num_pages, u32 option);
-            NOINLINE Result AllocateForProcess(KPageGroup *out, size_t num_pages, u32 option, u64 process_id, u8 fill_pattern);
+            NOINLINE Result AllocateAndOpenForProcess(KPageGroup *out, size_t num_pages, u32 option, u64 process_id, u8 fill_pattern);
 
             Pool GetPool(KPhysicalAddress address) const {
                 return this->GetManager(address).GetPool();
@@ -222,22 +222,6 @@ namespace ams::kern {
                 }
             }
 
-            void OpenFirst(KPhysicalAddress address, size_t num_pages) {
-                /* Repeatedly open references until we've done so for all pages. */
-                while (num_pages) {
-                    auto &manager = this->GetManager(address);
-                    const size_t cur_pages = std::min(num_pages, manager.GetPageOffsetToEnd(address));
-
-                    {
-                        KScopedLightLock lk(m_pool_locks[manager.GetPool()]);
-                        manager.OpenFirst(address, cur_pages);
-                    }
-
-                    num_pages -= cur_pages;
-                    address += cur_pages * PageSize;
-                }
-            }
-
             void Close(KPhysicalAddress address, size_t num_pages) {
                 /* Repeatedly close references until we've done so for all pages. */
                 while (num_pages) {

libraries/libmesosphere/include/mesosphere/kern_k_memory_region_type.hpp

@@ -211,8 +211,6 @@ namespace ams::kern {
     static_assert(KMemoryRegionType_DramKernelPtHeap.GetValue() == (0x24E | KMemoryRegionAttr_CarveoutProtected | KMemoryRegionAttr_NoUserMap | KMemoryRegionAttr_LinearMapped));
     static_assert(KMemoryRegionType_DramKernelInitPt.GetValue() == (0x44E | KMemoryRegionAttr_CarveoutProtected | KMemoryRegionAttr_NoUserMap | KMemoryRegionAttr_LinearMapped));
 
-    constexpr inline const auto KMemoryRegionType_DramKernelSecureAppletMemory = KMemoryRegionType_DramKernelBase.DeriveSparse(1, 3, 0).SetAttribute(KMemoryRegionAttr_LinearMapped);
-    static_assert(KMemoryRegionType_DramKernelSecureAppletMemory.GetValue() == (0x18E  | KMemoryRegionAttr_CarveoutProtected | KMemoryRegionAttr_NoUserMap | KMemoryRegionAttr_LinearMapped));
 
     constexpr inline const auto KMemoryRegionType_DramReservedEarly = KMemoryRegionType_DramReservedBase.DeriveAttribute(KMemoryRegionAttr_NoUserMap);
     static_assert(KMemoryRegionType_DramReservedEarly.GetValue() == (0x16 | KMemoryRegionAttr_NoUserMap));
@@ -253,9 +251,6 @@ namespace ams::kern {
     constexpr inline const auto KMemoryRegionType_VirtualDramUnknownDebug = KMemoryRegionType_Dram.DeriveSparse(2, 2, 1);
     static_assert(KMemoryRegionType_VirtualDramUnknownDebug.GetValue() == (0x52));
 
-    constexpr inline const auto KMemoryRegionType_VirtualDramKernelSecureAppletMemory = KMemoryRegionType_Dram.DeriveSparse(3, 1, 0);
-    static_assert(KMemoryRegionType_VirtualDramKernelSecureAppletMemory.GetValue() == (0x62));
-
     constexpr inline const auto KMemoryRegionType_VirtualDramKernelInitPt   = KMemoryRegionType_VirtualDramHeapBase.Derive(3, 0);
     constexpr inline const auto KMemoryRegionType_VirtualDramPoolManagement = KMemoryRegionType_VirtualDramHeapBase.Derive(3, 1);
     constexpr inline const auto KMemoryRegionType_VirtualDramUserPool       = KMemoryRegionType_VirtualDramHeapBase.Derive(3, 2);
@@ -332,8 +327,6 @@ namespace ams::kern {
             return KMemoryRegionType_VirtualDramKernelTraceBuffer;
         } else if (KMemoryRegionType_DramKernelPtHeap.IsAncestorOf(type_id)) {
             return KMemoryRegionType_VirtualDramKernelPtHeap;
-        } else if (KMemoryRegionType_DramKernelSecureAppletMemory.IsAncestorOf(type_id)) {
-            return KMemoryRegionType_VirtualDramKernelSecureAppletMemory;
         } else if ((type_id | KMemoryRegionAttr_ShouldKernelMap) == type_id) {
             return KMemoryRegionType_VirtualDramUnknownDebug;
         } else {

libraries/libmesosphere/include/mesosphere/kern_k_object_name.hpp

@@ -48,7 +48,7 @@ namespace ams::kern {
                 /* Check that the object is closed. */
                 R_UNLESS(derived->IsServerClosed(), svc::ResultInvalidState());
 
-                R_RETURN(Delete(obj.GetPointerUnsafe(), name));
+                return Delete(obj.GetPointerUnsafe(), name);
             }
 
             template<typename Derived> requires std::derived_from<Derived, KAutoObject>

libraries/libmesosphere/include/mesosphere/kern_k_page_bitmap.hpp

@@ -113,12 +113,11 @@ namespace ams::kern {
             static constexpr size_t MaxDepth = 4;
         private:
             u64 *m_bit_storages[MaxDepth];
-            u64 *m_end_storages[MaxDepth];
             RandomBitGenerator m_rng;
             size_t m_num_bits;
             size_t m_used_depths;
         public:
-            KPageBitmap() : m_bit_storages(), m_end_storages(), m_rng(), m_num_bits(), m_used_depths() { /* ... */ }
+            KPageBitmap() : m_bit_storages(), m_rng(), m_num_bits(), m_used_depths() { /* ... */ }
 
             constexpr size_t GetNumBits() const { return m_num_bits; }
             constexpr s32 GetHighestDepthIndex() const { return static_cast<s32>(m_used_depths) - 1; }
@@ -136,7 +135,6 @@ namespace ams::kern {
                     m_bit_storages[depth] = storage;
                     size = util::AlignUp(size, BITSIZEOF(u64)) / BITSIZEOF(u64);
                     storage += size;
-                    m_end_storages[depth] = storage;
                 }
 
                 return storage;
@@ -173,45 +171,6 @@ namespace ams::kern {
                 return static_cast<ssize_t>(offset);
             }
 
-            ssize_t FindFreeRange(size_t count) {
-                /* Check that it is possible to find a range. */
-                const u64 * const storage_start = m_bit_storages[m_used_depths - 1];
-                const u64 * const storage_end   = m_end_storages[m_used_depths - 1];
-
-                /* If we don't have a storage to iterate (or want more blocks than fit in a single storage), we can't find a free range. */
-                if (!(storage_start < storage_end && count <= BITSIZEOF(u64))) {
-                    return -1;
-                }
-
-                /* Walk the storages to select a random free range. */
-                const size_t options_per_storage = std::max<size_t>(BITSIZEOF(u64) / count, 1);
-                const size_t num_entries         = std::max<size_t>(storage_end - storage_start, 1);
-
-                const u64 free_mask = (static_cast<u64>(1) << count) - 1;
-
-                size_t num_valid_options = 0;
-                ssize_t chosen_offset = -1;
-                for (size_t storage_index = 0; storage_index < num_entries; ++storage_index) {
-                    u64 storage = storage_start[storage_index];
-                    for (size_t option = 0; option < options_per_storage; ++option) {
-                        if ((storage & free_mask) == free_mask) {
-                            /* We've found a new valid option. */
-                            ++num_valid_options;
-
-                            /* Select the Kth valid option with probability 1/K. This leads to an overall uniform distribution. */
-                            if (num_valid_options == 1 || m_rng.GenerateRandom(num_valid_options) == 0) {
-                                /* This is our first option, so select it. */
-                                chosen_offset = storage_index * BITSIZEOF(u64) + option * count;
-                            }
-                        }
-                        storage >>= count;
-                    }
-                }
-
-                /* Return the random offset we chose.*/
-                return chosen_offset;
-            }
-
             void SetBit(size_t offset) {
                 this->SetBit(this->GetHighestDepthIndex(), offset);
                 m_num_bits++;

libraries/libmesosphere/include/mesosphere/kern_k_page_buffer.hpp

@@ -16,33 +16,12 @@
 #pragma once
 #include <mesosphere/kern_slab_helpers.hpp>
 #include <mesosphere/kern_k_memory_layout.hpp>
-#include <mesosphere/kern_k_dynamic_page_manager.hpp>
 
 namespace ams::kern {
 
-    class KDynamicPageManager;
-
-    class KPageBuffer;
-
-    class KPageBufferSlabHeap : protected impl::KSlabHeapImpl {
-        public:
-            static constexpr size_t BufferSize            = PageSize;
-            static constinit inline size_t s_buffer_count = 0;
+    class KPageBuffer : public KSlabAllocated<KPageBuffer> {
         private:
-            size_t m_obj_size{};
-        public:
-            constexpr KPageBufferSlabHeap() = default;
-
-            /* See kern_init_slab_setup.cpp for definition. */
-            void Initialize(KDynamicPageManager &allocator);
-
-            KPageBuffer *Allocate();
-            void Free(KPageBuffer *pb);
-    };
-
-    class KPageBuffer {
-        private:
-            u8 m_buffer[KPageBufferSlabHeap::BufferSize];
+            alignas(PageSize) u8 m_buffer[PageSize];
         public:
             KPageBuffer() {
                 std::memset(m_buffer, 0, sizeof(m_buffer));
@@ -60,49 +39,8 @@ namespace ams::kern {
 
                 return GetPointer<KPageBuffer>(virt_addr);
             }
-        private:
-            static constinit inline KPageBufferSlabHeap s_slab_heap;
-        public:
-            static void InitializeSlabHeap(KDynamicPageManager &allocator) {
-                s_slab_heap.Initialize(allocator);
-            }
-
-            static KPageBuffer *Allocate() {
-                return s_slab_heap.Allocate();
-            }
-
-            static void Free(KPageBuffer *obj) {
-                s_slab_heap.Free(obj);
-            }
-
-            template<size_t ExpectedSize>
-            static ALWAYS_INLINE KPageBuffer *AllocateChecked() {
-                /* Check that the allocation is valid. */
-                MESOSPHERE_ABORT_UNLESS(sizeof(KPageBuffer) == ExpectedSize);
-
-                return Allocate();
-            }
-
-            template<size_t ExpectedSize>
-            static ALWAYS_INLINE void FreeChecked(KPageBuffer *obj) {
-                /* Check that the free is valid. */
-                MESOSPHERE_ABORT_UNLESS(sizeof(KPageBuffer) == ExpectedSize);
-
-                return Free(obj);
-            }
     };
-    static_assert(sizeof(KPageBuffer) == KPageBufferSlabHeap::BufferSize);
-
-    ALWAYS_INLINE KPageBuffer *KPageBufferSlabHeap::Allocate() {
-        KPageBuffer *pb = static_cast<KPageBuffer *>(KSlabHeapImpl::Allocate());
-        if (AMS_LIKELY(pb != nullptr)) {
-            std::construct_at(pb);
-        }
-        return pb;
-    }
-
-    ALWAYS_INLINE void KPageBufferSlabHeap::Free(KPageBuffer *pb) {
-        KSlabHeapImpl::Free(pb);
-    }
+    static_assert(sizeof(KPageBuffer)  == PageSize);
+    static_assert(alignof(KPageBuffer) == PageSize);
 
 }

libraries/libmesosphere/include/mesosphere/kern_k_page_group.hpp

@@ -138,7 +138,6 @@ namespace ams::kern {
 
             Result AddBlock(KPhysicalAddress addr, size_t num_pages);
             void Open() const;
-            void OpenFirst() const;
             void Close() const;
 
             size_t GetNumPages() const;

libraries/libmesosphere/include/mesosphere/kern_k_page_table_base.hpp

@@ -48,7 +48,6 @@ namespace ams::kern {
     static_assert(sizeof(KPageProperties) == sizeof(u32));
 
     class KResourceLimit;
-    class KSystemResource;
 
     class KPageTableBase {
         NON_COPYABLE(KPageTableBase);
@@ -72,14 +71,11 @@ namespace ams::kern {
             };
 
             enum OperationType {
-                OperationType_Map                                 = 0,
-                OperationType_MapFirst                            = 1,
-                OperationType_MapGroup                            = 2,
-                OperationType_Unmap                               = 3,
-                OperationType_ChangePermissions                   = 4,
-                OperationType_ChangePermissionsAndRefresh         = 5,
-                OperationType_ChangePermissionsAndRefreshAndFlush = 6,
-                OperationType_Separate                            = 7,
+                OperationType_Map                         = 0,
+                OperationType_MapGroup                    = 1,
+                OperationType_Unmap                       = 2,
+                OperationType_ChangePermissions           = 3,
+                OperationType_ChangePermissionsAndRefresh = 4,
             };
 
             static constexpr size_t MaxPhysicalMapAlignment = 1_GB;
@@ -166,7 +162,6 @@ namespace ams::kern {
             size_t m_max_heap_size;
             size_t m_mapped_physical_memory_size;
             size_t m_mapped_unsafe_physical_memory;
-            size_t m_mapped_insecure_memory;
             size_t m_mapped_ipc_server_memory;
             mutable KLightLock m_general_lock;
             mutable KLightLock m_map_physical_memory_lock;
@@ -193,8 +188,8 @@ namespace ams::kern {
                   m_alias_region_end(Null<KProcessAddress>), m_stack_region_start(Null<KProcessAddress>), m_stack_region_end(Null<KProcessAddress>),
                   m_kernel_map_region_start(Null<KProcessAddress>), m_kernel_map_region_end(Null<KProcessAddress>), m_alias_code_region_start(Null<KProcessAddress>),
                   m_alias_code_region_end(Null<KProcessAddress>), m_code_region_start(Null<KProcessAddress>), m_code_region_end(Null<KProcessAddress>),
-                  m_max_heap_size(), m_mapped_physical_memory_size(), m_mapped_unsafe_physical_memory(), m_mapped_insecure_memory(), m_mapped_ipc_server_memory(),
-                  m_general_lock(), m_map_physical_memory_lock(), m_device_map_lock(), m_impl(util::ConstantInitialize), m_memory_block_manager(util::ConstantInitialize),
+                  m_max_heap_size(), m_mapped_physical_memory_size(), m_mapped_unsafe_physical_memory(), m_mapped_ipc_server_memory(), m_general_lock(),
+                  m_map_physical_memory_lock(), m_device_map_lock(), m_impl(util::ConstantInitialize), m_memory_block_manager(util::ConstantInitialize),
                   m_allocate_option(), m_address_space_width(), m_is_kernel(), m_enable_aslr(), m_enable_device_address_space_merge(),
                   m_memory_block_slab_manager(), m_block_info_manager(), m_resource_limit(), m_cached_physical_linear_region(), m_cached_physical_heap_region(),
                   m_heap_fill_value(), m_ipc_fill_value(), m_stack_fill_value()
@@ -205,7 +200,7 @@ namespace ams::kern {
             explicit KPageTableBase() { /* ... */ }
 
             NOINLINE Result InitializeForKernel(bool is_64_bit, void *table, KVirtualAddress start, KVirtualAddress end);
-            NOINLINE Result InitializeForProcess(ams::svc::CreateProcessFlag as_type, bool enable_aslr, bool enable_device_address_space_merge, bool from_back, KMemoryManager::Pool pool, void *table, KProcessAddress start, KProcessAddress end, KProcessAddress code_address, size_t code_size, KSystemResource *system_resource, KResourceLimit *resource_limit);
+            NOINLINE Result InitializeForProcess(ams::svc::CreateProcessFlag as_type, bool enable_aslr, bool enable_device_address_space_merge, bool from_back, KMemoryManager::Pool pool, void *table, KProcessAddress start, KProcessAddress end, KProcessAddress code_address, size_t code_size, KMemoryBlockSlabManager *mem_block_slab_manager, KBlockInfoManager *block_info_manager, KResourceLimit *resource_limit);
 
             void Finalize();
 
@@ -364,11 +359,9 @@ namespace ams::kern {
             Result UnmapCodeMemory(KProcessAddress dst_address, KProcessAddress src_address, size_t size);
             Result MapIo(KPhysicalAddress phys_addr, size_t size, KMemoryPermission perm);
             Result MapIoRegion(KProcessAddress dst_address, KPhysicalAddress phys_addr, size_t size, ams::svc::MemoryMapping mapping, ams::svc::MemoryPermission perm);
-            Result UnmapIoRegion(KProcessAddress dst_address, KPhysicalAddress phys_addr, size_t size, ams::svc::MemoryMapping mapping);
+            Result UnmapIoRegion(KProcessAddress dst_address, KPhysicalAddress phys_addr, size_t size);
             Result MapStatic(KPhysicalAddress phys_addr, size_t size, KMemoryPermission perm);
             Result MapRegion(KMemoryRegionType region_type, KMemoryPermission perm);
-            Result MapInsecureMemory(KProcessAddress address, size_t size);
-            Result UnmapInsecureMemory(KProcessAddress address, size_t size);
 
             Result MapPages(KProcessAddress *out_addr, size_t num_pages, size_t alignment, KPhysicalAddress phys_addr, KProcessAddress region_start, size_t region_num_pages, KMemoryState state, KMemoryPermission perm) {
                 R_RETURN(this->MapPages(out_addr, num_pages, alignment, phys_addr, true, region_start, region_num_pages, state, perm));
@@ -399,8 +392,8 @@ namespace ams::kern {
             Result WriteDebugMemory(KProcessAddress address, const void *buffer, size_t size);
             Result WriteDebugIoMemory(KProcessAddress address, const void *buffer, size_t size);
 
-            Result LockForMapDeviceAddressSpace(bool *out_is_io, KProcessAddress address, size_t size, KMemoryPermission perm, bool is_aligned, bool check_heap);
-            Result LockForUnmapDeviceAddressSpace(KProcessAddress address, size_t size, bool check_heap);
+            Result LockForMapDeviceAddressSpace(KProcessAddress address, size_t size, KMemoryPermission perm, bool is_aligned);
+            Result LockForUnmapDeviceAddressSpace(KProcessAddress address, size_t size);
 
             Result UnlockForDeviceAddressSpace(KProcessAddress address, size_t size);
             Result UnlockForDeviceAddressSpacePartialMap(KProcessAddress address, size_t size);

libraries/libmesosphere/include/mesosphere/kern_k_priority_queue.hpp

@@ -234,11 +234,11 @@ namespace ams::kern {
             KPriorityQueueImpl m_scheduled_queue;
             KPriorityQueueImpl m_suggested_queue;
         private:
-            static constexpr ALWAYS_INLINE void ClearAffinityBit(u64 &affinity, s32 core) {
+            constexpr ALWAYS_INLINE void ClearAffinityBit(u64 &affinity, s32 core) {
                 affinity &= ~(UINT64_C(1) << core);
             }
 
-            static constexpr ALWAYS_INLINE s32 GetNextCore(u64 &affinity) {
+            constexpr ALWAYS_INLINE s32 GetNextCore(u64 &affinity) {
                 const s32 core = __builtin_ctzll(static_cast<unsigned long long>(affinity));
                 ClearAffinityBit(affinity, core);
                 return core;

libraries/libmesosphere/include/mesosphere/kern_k_process.hpp

@@ -31,7 +31,6 @@
 #include <mesosphere/kern_k_wait_object.hpp>
 #include <mesosphere/kern_k_dynamic_resource_manager.hpp>
 #include <mesosphere/kern_k_page_table_manager.hpp>
-#include <mesosphere/kern_k_system_resource.hpp>
 
 namespace ams::kern {
 
@@ -65,7 +64,8 @@ namespace ams::kern {
             s32                         m_ideal_core_id;
             void                       *m_attached_object;
             KResourceLimit             *m_resource_limit;
-            KSystemResource            *m_system_resource;
+            KVirtualAddress             m_system_resource_address;
+            size_t                      m_system_resource_num_pages;
             size_t                      m_memory_release_hint;
             State                       m_state;
             KLightLock                  m_state_lock;
@@ -84,9 +84,7 @@ namespace ams::kern {
             KCapabilities               m_capabilities;
             ams::svc::ProgramId         m_program_id;
             u64                         m_process_id;
-            #if defined(MESOSPHERE_ENABLE_PROCESS_CREATION_TIME)
             s64                         m_creation_time;
-            #endif
             KProcessAddress             m_code_address;
             size_t                      m_code_size;
             size_t                      m_main_thread_stack_size;
@@ -110,7 +108,6 @@ namespace ams::kern {
             KWaitObject                 m_wait_object;
             KThread                    *m_running_threads[cpu::NumCores];
             u64                         m_running_thread_idle_counts[cpu::NumCores];
-            u64                         m_running_thread_switch_counts[cpu::NumCores];
             KThread                    *m_pinned_threads[cpu::NumCores];
             util::Atomic<s64>           m_cpu_time;
             util::Atomic<s64>           m_num_process_switches;
@@ -120,6 +117,13 @@ namespace ams::kern {
             util::Atomic<s64>           m_num_ipc_messages;
             util::Atomic<s64>           m_num_ipc_replies;
             util::Atomic<s64>           m_num_ipc_receives;
+            KDynamicPageManager         m_dynamic_page_manager;
+            KMemoryBlockSlabManager     m_memory_block_slab_manager;
+            KBlockInfoManager           m_block_info_manager;
+            KPageTableManager           m_page_table_manager;
+            KMemoryBlockSlabHeap        m_memory_block_heap;
+            KBlockInfoSlabHeap          m_block_info_heap;
+            KPageTableSlabHeap          m_page_table_heap;
         private:
             Result Initialize(const ams::svc::CreateProcessParameter &params);
 
@@ -280,18 +284,17 @@ namespace ams::kern {
             void IncrementRunningThreadCount();
             void DecrementRunningThreadCount();
 
-            size_t GetTotalSystemResourceSize() const {
-                return m_system_resource->IsSecureResource() ? static_cast<KSecureSystemResource *>(m_system_resource)->GetSize() : 0;
-            }
-
+            size_t GetTotalSystemResourceSize() const { return m_system_resource_num_pages * PageSize; }
             size_t GetUsedSystemResourceSize() const {
-                return m_system_resource->IsSecureResource() ? static_cast<KSecureSystemResource *>(m_system_resource)->GetUsedSize() : 0;
+                if (m_system_resource_num_pages == 0) {
+                    return 0;
+                }
+                return m_dynamic_page_manager.GetUsed() * PageSize;
             }
 
-            void SetRunningThread(s32 core, KThread *thread, u64 idle_count, u64 switch_count) {
-                m_running_threads[core]              = thread;
-                m_running_thread_idle_counts[core]   = idle_count;
-                m_running_thread_switch_counts[core] = switch_count;
+            void SetRunningThread(s32 core, KThread *thread, u64 idle_count) {
+                m_running_threads[core]            = thread;
+                m_running_thread_idle_counts[core] = idle_count;
             }
 
             void ClearRunningThread(KThread *thread) {
@@ -302,15 +305,13 @@ namespace ams::kern {
                 }
             }
 
-            const KSystemResource &GetSystemResource() const { return *m_system_resource; }
-
-            const KMemoryBlockSlabManager &GetMemoryBlockSlabManager() const { return m_system_resource->GetMemoryBlockSlabManager(); }
-            const KBlockInfoManager &GetBlockInfoManager() const { return m_system_resource->GetBlockInfoManager(); }
-            const KPageTableManager &GetPageTableManager() const { return m_system_resource->GetPageTableManager(); }
+            const KDynamicPageManager &GetDynamicPageManager() const { return m_dynamic_page_manager; }
+            const KMemoryBlockSlabManager &GetMemoryBlockSlabManager() const { return m_memory_block_slab_manager; }
+            const KBlockInfoManager &GetBlockInfoManager() const { return m_block_info_manager; }
+            const KPageTableManager &GetPageTableManager() const { return m_page_table_manager; }
 
             constexpr KThread *GetRunningThread(s32 core) const { return m_running_threads[core]; }
             constexpr u64 GetRunningThreadIdleCount(s32 core) const { return m_running_thread_idle_counts[core]; }
-            constexpr u64 GetRunningThreadSwitchCount(s32 core) const { return m_running_thread_switch_counts[core]; }
 
             void RegisterThread(KThread *thread);
             void UnregisterThread(KThread *thread);

libraries/libmesosphere/include/mesosphere/kern_k_scheduler.hpp

@@ -43,7 +43,6 @@ namespace ams::kern {
                 bool interrupt_task_runnable{false};
                 bool should_count_idle{false};
                 u64  idle_count{0};
-                u64  switch_count{0};
                 KThread *highest_priority_thread{nullptr};
                 void *idle_thread_stack{nullptr};
                 KThread *prev_thread{nullptr};
@@ -68,7 +67,6 @@ namespace ams::kern {
                 m_state.interrupt_task_runnable = false;
                 m_state.should_count_idle       = false;
                 m_state.idle_count              = 0;
-                m_state.switch_count            = 0;
                 m_state.idle_thread_stack       = nullptr;
                 m_state.highest_priority_thread = nullptr;
                 m_state.prev_thread             = nullptr;
@@ -95,10 +93,6 @@ namespace ams::kern {
                 return m_state.idle_count;
             }
 
-            ALWAYS_INLINE u64 GetSwitchCount() const {
-                return m_state.switch_count;
-            }
-
             ALWAYS_INLINE KThread *GetIdleThread() const {
                 return m_idle_thread;
             }
@@ -158,7 +152,7 @@ namespace ams::kern {
             static NOINLINE void OnThreadPriorityChanged(KThread *thread, s32 old_priority);
             static NOINLINE void OnThreadAffinityMaskChanged(KThread *thread, const KAffinityMask &old_affinity, s32 old_core);
 
-            static NOINLINE void RotateScheduledQueue(s32 core_id, s32 priority);
+            static NOINLINE void RotateScheduledQueue(s32 priority, s32 core_id);
 
             static NOINLINE void YieldWithoutCoreMigration();
             static NOINLINE void YieldWithCoreMigration();

libraries/libmesosphere/include/mesosphere/kern_k_scheduler_lock.hpp

@@ -49,9 +49,9 @@ namespace ams::kern {
                 MESOSPHERE_ASSERT_THIS();
 
                 if (this->IsLockedByCurrentThread()) {
-                    /* If we already own the lock, the lock count should be > 0. */
-                    /* For debug, ensure this is true. */
+                    /* If we already own the lock, we can just increment the count. */
                     MESOSPHERE_ASSERT(m_lock_count > 0);
+                    m_lock_count++;
                 } else {
                     /* Otherwise, we want to disable scheduling and acquire the spinlock. */
                     SchedulerType::DisableScheduling();
@@ -61,12 +61,10 @@ namespace ams::kern {
                     MESOSPHERE_ASSERT(m_lock_count == 0);
                     MESOSPHERE_ASSERT(m_owner_thread == nullptr);
 
-                    /* Take ownership of the lock. */
+                    /* Increment count, take ownership. */
+                    m_lock_count = 1;
                     m_owner_thread = GetCurrentThreadPointer();
                 }
-
-                /* Increment the lock count. */
-                m_lock_count++;
             }
 
             MESOSPHERE_ALWAYS_INLINE_IF_RELEASE void Unlock() {

libraries/libmesosphere/include/mesosphere/kern_k_session_request.hpp

@@ -29,10 +29,7 @@ namespace ams::kern {
         public:
             class SessionMappings {
                 private:
-                    /* At most 15 buffers of each type (4-bit descriptor counts), for 45 total. */
-                    static constexpr size_t NumMappings        = ((1ul << 4) - 1) * 3;
-                    static constexpr size_t NumStaticMappings  = 8;
-                    static constexpr size_t NumDynamicMappings = NumMappings - NumStaticMappings;
+                    static constexpr size_t NumStaticMappings = 8;
 
                     class Mapping {
                         private:
@@ -53,27 +50,16 @@ namespace ams::kern {
                             constexpr ALWAYS_INLINE size_t GetSize() const { return m_size; }
                             constexpr ALWAYS_INLINE KMemoryState GetMemoryState() const { return m_state; }
                     };
-                public:
-                    class DynamicMappings : public KSlabAllocated<DynamicMappings, true> {
-                        private:
-                            Mapping m_mappings[NumDynamicMappings];
-                        public:
-                            constexpr explicit DynamicMappings() : m_mappings() { /* ... */ }
-
-                            constexpr ALWAYS_INLINE       Mapping &Get(size_t idx)       { return m_mappings[idx]; }
-                            constexpr ALWAYS_INLINE const Mapping &Get(size_t idx) const { return m_mappings[idx]; }
-                    };
-                    static_assert(sizeof(DynamicMappings) == sizeof(Mapping) * NumDynamicMappings);
                 private:
                     Mapping m_static_mappings[NumStaticMappings];
-                    DynamicMappings *m_dynamic_mappings;
+                    Mapping *m_mappings;
                     u8 m_num_send;
                     u8 m_num_recv;
                     u8 m_num_exch;
                 public:
-                    constexpr explicit SessionMappings(util::ConstantInitializeTag) : m_static_mappings(), m_dynamic_mappings(), m_num_send(), m_num_recv(), m_num_exch() { /* ... */ }
+                    constexpr explicit SessionMappings(util::ConstantInitializeTag) : m_static_mappings(), m_mappings(), m_num_send(), m_num_recv(), m_num_exch() { /* ... */ }
 
-                    explicit SessionMappings() : m_dynamic_mappings(nullptr), m_num_send(), m_num_recv(), m_num_exch() { /* ... */ }
+                    explicit SessionMappings() : m_mappings(nullptr), m_num_send(), m_num_recv(), m_num_exch() { /* ... */ }
 
                     void Initialize() { /* ... */ }
                     void Finalize();
@@ -110,7 +96,7 @@ namespace ams::kern {
                         if (index < NumStaticMappings) {
                             return m_static_mappings[index];
                         } else {
-                            return m_dynamic_mappings->Get(index - NumStaticMappings);
+                            return m_mappings[index - NumStaticMappings];
                         }
                     }
 
@@ -121,7 +107,7 @@ namespace ams::kern {
                         if (index < NumStaticMappings) {
                             return m_static_mappings[index];
                         } else {
-                            return m_dynamic_mappings->Get(index - NumStaticMappings);
+                            return m_mappings[index - NumStaticMappings];
                         }
                     }
 
@@ -132,7 +118,7 @@ namespace ams::kern {
                         if (index < NumStaticMappings) {
                             return m_static_mappings[index];
                         } else {
-                            return m_dynamic_mappings->Get(index - NumStaticMappings);
+                            return m_mappings[index - NumStaticMappings];
                         }
                     }
             };

libraries/libmesosphere/include/mesosphere/kern_k_shared_memory.hpp

@@ -35,7 +35,7 @@ namespace ams::kern {
             bool m_is_initialized;
         public:
             explicit KSharedMemory()
-                : m_page_group(Kernel::GetSystemSystemResource().GetBlockInfoManagerPointer()), m_resource_limit(nullptr), m_owner_process_id(std::numeric_limits<u64>::max()),
+                : m_page_group(std::addressof(Kernel::GetSystemBlockInfoManager())), m_resource_limit(nullptr), m_owner_process_id(std::numeric_limits<u64>::max()),
                   m_owner_perm(ams::svc::MemoryPermission_None), m_remote_perm(ams::svc::MemoryPermission_None), m_is_initialized(false)
             {
                 /* ... */

libraries/libmesosphere/include/mesosphere/kern_k_system_control_base.hpp

@@ -21,22 +21,11 @@ namespace ams::kern {
 
     struct InitialProcessBinaryLayout;
 
-    namespace init {
-
-        struct KInitArguments;
-
-    }
-
 }
 
 namespace ams::kern {
 
-    class KResourceLimit;
-
     class KSystemControlBase {
-        public:
-            /* This can be overridden as needed. */
-            static constexpr size_t SecureAppletMemorySize = 0;
         protected:
             /* Nintendo uses std::mt19937_t for randomness. */
             /* To save space (and because mt19337_t isn't secure anyway), */
@@ -46,8 +35,6 @@ namespace ams::kern {
             static constinit inline KSpinLock    s_random_lock;
         public:
             class Init {
-                private:
-                    static void CpuOnImpl(u64 core_id, uintptr_t entrypoint, uintptr_t arg);
                 public:
                     /* Initialization. */
                     static size_t GetRealMemorySize();
@@ -55,7 +42,7 @@ namespace ams::kern {
                     static KPhysicalAddress GetKernelPhysicalBaseAddress(KPhysicalAddress base_address);
                     static void GetInitialProcessBinaryLayout(InitialProcessBinaryLayout *out);
                     static bool ShouldIncreaseThreadResourceLimit();
-                    static void TurnOnCpu(u64 core_id, const ams::kern::init::KInitArguments *args);
+                    static void CpuOn(u64 core_id, uintptr_t entrypoint, uintptr_t arg);
                     static size_t GetApplicationPoolSize();
                     static size_t GetAppletPoolSize();
                     static size_t GetMinimumNonSecureSystemPoolSize();
@@ -65,11 +52,9 @@ namespace ams::kern {
                     static void GenerateRandom(u64 *dst, size_t count);
                     static u64  GenerateRandomRange(u64 min, u64 max);
             };
-        protected:
-            static NOINLINE void InitializePhase1Base(u64 seed);
         public:
             /* Initialization. */
-            static NOINLINE void InitializePhase1();
+            static NOINLINE void InitializePhase1(bool skip_target_system = false);
             static NOINLINE void InitializePhase2();
             static NOINLINE u32 GetCreateProcessMemoryPool();
 
@@ -98,10 +83,6 @@ namespace ams::kern {
             static size_t CalculateRequiredSecureMemorySize(size_t size, u32 pool);
             static Result AllocateSecureMemory(KVirtualAddress *out, size_t size, u32 pool);
             static void FreeSecureMemory(KVirtualAddress address, size_t size, u32 pool);
-
-            /* Insecure Memory. */
-            static KResourceLimit *GetInsecureMemoryResourceLimit();
-            static u32 GetInsecureMemoryPool();
         protected:
             template<typename F>
             static ALWAYS_INLINE u64 GenerateUniformRange(u64 min, u64 max, F f) {

libraries/libmesosphere/include/mesosphere/kern_k_system_resource.hpp

@@ -1,108 +0,0 @@
-/*
- * Copyright (c) Atmosphère-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include <mesosphere/kern_common.hpp>
-#include <mesosphere/kern_k_auto_object.hpp>
-#include <mesosphere/kern_slab_helpers.hpp>
-#include <mesosphere/kern_k_memory_manager.hpp>
-#include <mesosphere/kern_k_dynamic_resource_manager.hpp>
-#include <mesosphere/kern_k_page_table_manager.hpp>
-#include <mesosphere/kern_k_resource_limit.hpp>
-
-namespace ams::kern {
-
-    /* NOTE: Nintendo's implementation does not have the "is_secure_resource" field, and instead uses virtual IsSecureResource(). */
-
-    class KSystemResource : public KAutoObject {
-        MESOSPHERE_AUTOOBJECT_TRAITS(KSystemResource, KAutoObject);
-        private:
-            KMemoryBlockSlabManager *m_p_memory_block_slab_manager{};
-            KBlockInfoManager       *m_p_block_info_manager{};
-            KPageTableManager       *m_p_page_table_manager{};
-            bool m_is_secure_resource{false};
-        public:
-            explicit KSystemResource() : KAutoObject() { /* ... */ }
-
-            constexpr explicit KSystemResource(util::ConstantInitializeTag) : KAutoObject(util::ConstantInitialize) { /* ... */ }
-        protected:
-            ALWAYS_INLINE void SetSecureResource() { m_is_secure_resource = true; }
-        public:
-            virtual void Destroy() override { MESOSPHERE_PANIC("KSystemResource::Destroy() was called"); }
-
-            ALWAYS_INLINE bool IsSecureResource() const { return m_is_secure_resource; }
-
-            void SetManagers(KMemoryBlockSlabManager &mb, KBlockInfoManager &bi, KPageTableManager &pt) {
-                MESOSPHERE_ASSERT(m_p_memory_block_slab_manager == nullptr);
-                MESOSPHERE_ASSERT(m_p_block_info_manager == nullptr);
-                MESOSPHERE_ASSERT(m_p_page_table_manager == nullptr);
-
-                m_p_memory_block_slab_manager = std::addressof(mb);
-                m_p_block_info_manager        = std::addressof(bi);
-                m_p_page_table_manager        = std::addressof(pt);
-            }
-
-            const KMemoryBlockSlabManager &GetMemoryBlockSlabManager() const { return *m_p_memory_block_slab_manager; }
-            const KBlockInfoManager &GetBlockInfoManager() const { return *m_p_block_info_manager; }
-            const KPageTableManager &GetPageTableManager() const { return *m_p_page_table_manager; }
-
-            KMemoryBlockSlabManager &GetMemoryBlockSlabManager() { return *m_p_memory_block_slab_manager; }
-            KBlockInfoManager &GetBlockInfoManager() { return *m_p_block_info_manager; }
-            KPageTableManager &GetPageTableManager() { return *m_p_page_table_manager; }
-
-            KMemoryBlockSlabManager *GetMemoryBlockSlabManagerPointer() { return m_p_memory_block_slab_manager; }
-            KBlockInfoManager *GetBlockInfoManagerPointer() { return m_p_block_info_manager; }
-            KPageTableManager *GetPageTableManagerPointer() { return m_p_page_table_manager; }
-    };
-
-    class KSecureSystemResource final : public KAutoObjectWithSlabHeap<KSecureSystemResource, KSystemResource> {
-        private:
-            bool                        m_is_initialized;
-            KMemoryManager::Pool        m_resource_pool;
-            KDynamicPageManager         m_dynamic_page_manager;
-            KMemoryBlockSlabManager     m_memory_block_slab_manager;
-            KBlockInfoManager           m_block_info_manager;
-            KPageTableManager           m_page_table_manager;
-            KMemoryBlockSlabHeap        m_memory_block_heap;
-            KBlockInfoSlabHeap          m_block_info_heap;
-            KPageTableSlabHeap          m_page_table_heap;
-            KResourceLimit             *m_resource_limit;
-            KVirtualAddress             m_resource_address;
-            size_t                      m_resource_size;
-        public:
-            explicit KSecureSystemResource() : m_is_initialized(false), m_resource_limit(nullptr) {
-                /* Mark ourselves as being a secure resource. */
-                this->SetSecureResource();
-            }
-
-            Result Initialize(size_t size, KResourceLimit *resource_limit, KMemoryManager::Pool pool);
-            void Finalize();
-
-            bool IsInitialized() const { return m_is_initialized; }
-            static void PostDestroy(uintptr_t arg) { MESOSPHERE_UNUSED(arg); /* ... */ }
-
-            ALWAYS_INLINE size_t CalculateRequiredSecureMemorySize() const {
-                return CalculateRequiredSecureMemorySize(m_resource_size, m_resource_pool);
-            }
-
-            ALWAYS_INLINE size_t GetSize() const { return m_resource_size; }
-            ALWAYS_INLINE size_t GetUsedSize() const { return m_dynamic_page_manager.GetUsed() * PageSize; }
-
-            const KDynamicPageManager &GetDynamicPageManager() const { return m_dynamic_page_manager; }
-        public:
-            static size_t CalculateRequiredSecureMemorySize(size_t size, KMemoryManager::Pool pool);
-    };
-
-}

libraries/libmesosphere/include/mesosphere/kern_k_thread.hpp

@@ -108,12 +108,10 @@ namespace ams::kern {
                 u8 exception_flags;
                 bool is_pinned;
                 u8 reserved_2f;
-                u8 reserved_30[0x10];
                 KThreadContext context;
             };
 
             static_assert(util::IsAligned(AMS_OFFSETOF(StackParameters, context), 0x10));
-            static_assert(sizeof(StackParameters) == THREAD_STACK_PARAMETERS_SIZE);
 
             static_assert(AMS_OFFSETOF(StackParameters, svc_access_flags)          == THREAD_STACK_PARAMETERS_SVC_PERMISSION);
             static_assert(AMS_OFFSETOF(StackParameters, caller_save_fpu_registers) == THREAD_STACK_PARAMETERS_CALLER_SAVE_FPU_REGISTERS);
@@ -125,10 +123,8 @@ namespace ams::kern {
             static_assert(AMS_OFFSETOF(StackParameters, exception_flags)           == THREAD_STACK_PARAMETERS_EXCEPTION_FLAGS);
             static_assert(AMS_OFFSETOF(StackParameters, is_pinned)                 == THREAD_STACK_PARAMETERS_IS_PINNED);
             static_assert(AMS_OFFSETOF(StackParameters, reserved_2f)               == THREAD_STACK_PARAMETERS_RESERVED_2F);
-            static_assert(AMS_OFFSETOF(StackParameters, reserved_30)               == THREAD_STACK_PARAMETERS_RESERVED_30);
             static_assert(AMS_OFFSETOF(StackParameters, context)                   == THREAD_STACK_PARAMETERS_THREAD_CONTEXT);
 
-
             static_assert(ExceptionFlag_IsCallingSvc                  == THREAD_EXCEPTION_FLAG_IS_CALLING_SVC);
             static_assert(ExceptionFlag_IsInExceptionHandler          == THREAD_EXCEPTION_FLAG_IS_IN_EXCEPTION_HANDLER);
             static_assert(ExceptionFlag_IsFpuContextRestoreNeeded     == THREAD_EXCEPTION_FLAG_IS_FPU_CONTEXT_RESTORE_NEEDED);
@@ -201,28 +197,6 @@ namespace ams::kern {
             };
             static_assert(ams::util::HasRedBlackKeyType<ConditionVariableComparator>);
             static_assert(std::same_as<ams::util::RedBlackKeyType<ConditionVariableComparator, void>, ConditionVariableComparator::RedBlackKeyType>);
-
-            struct LockWithPriorityInheritanceComparator {
-                struct RedBlackKeyType {
-                    s32 m_priority;
-
-                    constexpr ALWAYS_INLINE s32 GetPriority() const {
-                        return m_priority;
-                    }
-                };
-
-                template<typename T> requires (std::same_as<T, KThread> || std::same_as<T, RedBlackKeyType>)
-                static constexpr ALWAYS_INLINE int Compare(const T &lhs, const KThread &rhs) {
-                    if (lhs.GetPriority() < rhs.GetPriority()) {
-                        /* Sort by priority. */
-                        return -1;
-                    } else {
-                        return 1;
-                    }
-                }
-            };
-            static_assert(ams::util::HasRedBlackKeyType<LockWithPriorityInheritanceComparator>);
-            static_assert(std::same_as<ams::util::RedBlackKeyType<LockWithPriorityInheritanceComparator, void>, LockWithPriorityInheritanceComparator::RedBlackKeyType>);
         private:
             util::IntrusiveListNode         m_process_list_node;
             util::IntrusiveRedBlackTreeNode m_condvar_arbiter_tree_node;
@@ -231,67 +205,6 @@ namespace ams::kern {
             using ConditionVariableThreadTreeTraits = util::IntrusiveRedBlackTreeMemberTraitsDeferredAssert<&KThread::m_condvar_arbiter_tree_node>;
             using ConditionVariableThreadTree       = ConditionVariableThreadTreeTraits::TreeType<ConditionVariableComparator>;
 
-            using LockWithPriorityInheritanceThreadTreeTraits = util::IntrusiveRedBlackTreeMemberTraitsDeferredAssert<&KThread::m_condvar_arbiter_tree_node>;
-            using LockWithPriorityInheritanceThreadTree       = ConditionVariableThreadTreeTraits::TreeType<LockWithPriorityInheritanceComparator>;
-        public:
-            class LockWithPriorityInheritanceInfo : public KSlabAllocated<LockWithPriorityInheritanceInfo>, public util::IntrusiveListBaseNode<LockWithPriorityInheritanceInfo> {
-                private:
-                    LockWithPriorityInheritanceThreadTree m_tree;
-                    KProcessAddress m_address_key;
-                    KThread *m_owner;
-                    u32 m_waiter_count;
-                public:
-                    constexpr LockWithPriorityInheritanceInfo() : m_tree(), m_address_key(Null<KProcessAddress>), m_owner(nullptr), m_waiter_count() {
-                        /* ... */
-                    }
-
-                    static LockWithPriorityInheritanceInfo *Create(KProcessAddress address_key) {
-                        /* Create a new lock info. */
-                        auto *new_lock = LockWithPriorityInheritanceInfo::Allocate();
-                        MESOSPHERE_ABORT_UNLESS(new_lock != nullptr);
-
-                        /* Set the new lock's address key. */
-                        new_lock->m_address_key = address_key;
-
-                        return new_lock;
-                    }
-
-                    void SetOwner(KThread *new_owner) {
-                        /* Set new owner. */
-                        m_owner = new_owner;
-                    }
-
-                    void AddWaiter(KThread *waiter) {
-                        /* Insert the waiter. */
-                        m_tree.insert(*waiter);
-                        m_waiter_count++;
-
-                        waiter->SetWaitingLockInfo(this);
-                    }
-
-                    [[nodiscard]] bool RemoveWaiter(KThread *waiter) {
-                        m_tree.erase(m_tree.iterator_to(*waiter));
-
-                        waiter->SetWaitingLockInfo(nullptr);
-
-                        return (--m_waiter_count) == 0;
-                    }
-
-                    KThread *GetHighestPriorityWaiter() { return std::addressof(m_tree.front()); }
-                    const KThread *GetHighestPriorityWaiter() const { return std::addressof(m_tree.front()); }
-
-                    LockWithPriorityInheritanceThreadTree &GetThreadTree() { return m_tree; }
-                    const LockWithPriorityInheritanceThreadTree &GetThreadTree() const { return m_tree; }
-
-                    constexpr KProcessAddress GetAddressKey() const { return m_address_key; }
-
-                    constexpr KThread *GetOwner() const { return m_owner; }
-
-                    constexpr u32 GetWaiterCount() const { return m_waiter_count; }
-            };
-        private:
-            using LockWithPriorityInheritanceInfoList = util::IntrusiveListBaseTraits<LockWithPriorityInheritanceInfo>::ListType;
-
             ConditionVariableThreadTree                        *m_condvar_tree;
             uintptr_t                                           m_condvar_key;
             alignas(16) KThreadContext::CallerSaveFpuRegisters  m_caller_save_fpu_registers;
@@ -311,9 +224,9 @@ namespace ams::kern {
             s64                                                 m_last_scheduled_tick;
             QueueEntry                                          m_per_core_priority_queue_entry[cpu::NumCores];
             KThreadQueue                                       *m_wait_queue;
-            LockWithPriorityInheritanceInfoList                 m_held_lock_info_list;
-            LockWithPriorityInheritanceInfo                    *m_waiting_lock_info;
+            WaiterList                                          m_waiter_list;
             WaiterList                                          m_pinned_waiter_list;
+            KThread                                            *m_lock_owner;
             uintptr_t                                           m_debug_params[3];
             KAutoObject                                        *m_closed_object;
             u32                                                 m_address_key_value;
@@ -347,8 +260,8 @@ namespace ams::kern {
                   m_process_list_node{}, m_condvar_arbiter_tree_node{util::ConstantInitialize}, m_priority{-1}, m_condvar_tree{}, m_condvar_key{},
                   m_caller_save_fpu_registers{}, m_virtual_affinity_mask{}, m_physical_affinity_mask{}, m_thread_id{}, m_cpu_time{0}, m_address_key{Null<KProcessAddress>}, m_parent{},
                   m_kernel_stack_top{}, m_light_ipc_data{}, m_tls_address{Null<KProcessAddress>}, m_tls_heap_address{}, m_activity_pause_lock{}, m_sync_object_buffer{util::ConstantInitialize},
-                  m_schedule_count{}, m_last_scheduled_tick{}, m_per_core_priority_queue_entry{}, m_wait_queue{}, m_held_lock_info_list{}, m_waiting_lock_info{},
-                  m_pinned_waiter_list{}, m_debug_params{}, m_closed_object{}, m_address_key_value{}, m_suspend_request_flags{}, m_suspend_allowed_flags{}, m_synced_index{},
+                  m_schedule_count{}, m_last_scheduled_tick{}, m_per_core_priority_queue_entry{}, m_wait_queue{}, m_waiter_list{}, m_pinned_waiter_list{},
+                  m_lock_owner{}, m_debug_params{}, m_closed_object{}, m_address_key_value{}, m_suspend_request_flags{}, m_suspend_allowed_flags{}, m_synced_index{},
                   m_wait_result{svc::ResultNoSynchronizationObject()}, m_debug_exception_result{ResultSuccess()}, m_base_priority{}, m_base_priority_on_unpin{},
                   m_physical_ideal_core_id{}, m_virtual_ideal_core_id{}, m_num_kernel_waiters{}, m_current_core_id{}, m_core_id{}, m_original_physical_affinity_mask{},
                   m_original_physical_ideal_core_id{}, m_num_core_migration_disables{}, m_thread_state{}, m_termination_requested{false}, m_wait_cancelled{},
@@ -494,10 +407,6 @@ namespace ams::kern {
             void ClearUsermodeExceptionSvcPermissions();
         private:
             void UpdateState();
-
-            ALWAYS_INLINE void AddHeldLock(LockWithPriorityInheritanceInfo *lock_info);
-            ALWAYS_INLINE LockWithPriorityInheritanceInfo *FindHeldLock(KProcessAddress address_key);
-
             ALWAYS_INLINE void AddWaiterImpl(KThread *thread);
             ALWAYS_INLINE void RemoveWaiterImpl(KThread *thread);
             ALWAYS_INLINE static void RestorePriority(KThread *thread);
@@ -532,8 +441,6 @@ namespace ams::kern {
             constexpr uintptr_t GetAddressArbiterKey() const { return m_condvar_key; }
 
             constexpr void SetConditionVariable(ConditionVariableThreadTree *tree, KProcessAddress address, uintptr_t cv_key, u32 value) {
-                MESOSPHERE_ASSERT(m_waiting_lock_info == nullptr);
-
                 m_condvar_tree      = tree;
                 m_condvar_key       = cv_key;
                 m_address_key       = address;
@@ -549,8 +456,6 @@ namespace ams::kern {
             }
 
             constexpr void SetAddressArbiter(ConditionVariableThreadTree *tree, uintptr_t address) {
-                MESOSPHERE_ASSERT(m_waiting_lock_info == nullptr);
-
                 m_condvar_tree = tree;
                 m_condvar_key  = address;
             }
@@ -586,17 +491,15 @@ namespace ams::kern {
 
             void AddWaiter(KThread *thread);
             void RemoveWaiter(KThread *thread);
-            KThread *RemoveWaiterByKey(bool *out_has_waiters, KProcessAddress key);
+            KThread *RemoveWaiterByKey(s32 *out_num_waiters, KProcessAddress key);
 
             constexpr KProcessAddress GetAddressKey() const { return m_address_key; }
             constexpr u32 GetAddressKeyValue() const { return m_address_key_value; }
-            constexpr void SetAddressKey(KProcessAddress key) { MESOSPHERE_ASSERT(m_waiting_lock_info == nullptr); m_address_key = key; }
-            constexpr void SetAddressKey(KProcessAddress key, u32 val) { MESOSPHERE_ASSERT(m_waiting_lock_info == nullptr); m_address_key = key; m_address_key_value = val; }
+            constexpr void SetAddressKey(KProcessAddress key) { m_address_key = key; }
+            constexpr void SetAddressKey(KProcessAddress key, u32 val) { m_address_key = key; m_address_key_value = val; }
 
-            constexpr void SetWaitingLockInfo(LockWithPriorityInheritanceInfo *lock) { m_waiting_lock_info = lock; }
-            constexpr LockWithPriorityInheritanceInfo *GetWaitingLockInfo() { return m_waiting_lock_info; }
-
-            constexpr KThread *GetLockOwner() const { return m_waiting_lock_info != nullptr ? m_waiting_lock_info->GetOwner() : nullptr; }
+            constexpr void SetLockOwner(KThread *owner) { m_lock_owner = owner; }
+            constexpr KThread *GetLockOwner() const { return m_lock_owner; }
 
             constexpr void ClearWaitQueue() { m_wait_queue = nullptr; }
 
@@ -626,6 +529,8 @@ namespace ams::kern {
             constexpr u32 *GetLightSessionData() const { return m_light_ipc_data; }
             constexpr void SetLightSessionData(u32 *data) { m_light_ipc_data = data; }
 
+            bool HasWaiters() const { return !m_waiter_list.empty(); }
+
             constexpr s64 GetLastScheduledTick() const { return m_last_scheduled_tick; }
             constexpr void SetLastScheduledTick(s64 tick) { m_last_scheduled_tick = tick; }
 

libraries/libmesosphere/include/mesosphere/kern_kernel.hpp

@@ -63,7 +63,7 @@ namespace ams::kern {
             static constexpr size_t ApplicationMemoryBlockSlabHeapSize = 20000;
             static constexpr size_t SystemMemoryBlockSlabHeapSize      = 10000;
             static constexpr size_t BlockInfoSlabHeapSize              = 4000;
-            static constexpr size_t ReservedDynamicPageCount           = 64;
+            static constexpr size_t ReservedDynamicPageCount           = 70;
         private:
             static State s_state;
             static KResourceLimit s_system_resource_limit;
@@ -78,8 +78,6 @@ namespace ams::kern {
             static KMemoryBlockSlabManager s_sys_memory_block_manager;
             static KBlockInfoManager s_app_block_info_manager;
             static KBlockInfoManager s_sys_block_info_manager;
-            static KSystemResource s_app_system_resource;
-            static KSystemResource s_sys_system_resource;
             static KSupervisorPageTable s_supervisor_page_table;
             static KUnsafeMemory s_unsafe_memory;
             static KWorkerTaskManager s_worker_task_managers[KWorkerTaskManager::WorkerType_Count];
@@ -131,12 +129,28 @@ namespace ams::kern {
                 return s_memory_manager;
             }
 
-            static ALWAYS_INLINE KSystemResource &GetApplicationSystemResource() {
-                return s_app_system_resource;
+            static ALWAYS_INLINE KMemoryBlockSlabManager &GetApplicationMemoryBlockManager() {
+                return s_app_memory_block_manager;
             }
 
-            static ALWAYS_INLINE KSystemResource &GetSystemSystemResource() {
-                return s_sys_system_resource;
+            static ALWAYS_INLINE KMemoryBlockSlabManager &GetSystemMemoryBlockManager() {
+                return s_sys_memory_block_manager;
+            }
+
+            static ALWAYS_INLINE KBlockInfoManager &GetApplicationBlockInfoManager() {
+                return s_app_block_info_manager;
+            }
+
+            static ALWAYS_INLINE KBlockInfoManager &GetSystemBlockInfoManager() {
+                return s_sys_block_info_manager;
+            }
+
+            static ALWAYS_INLINE KPageTableManager &GetApplicationPageTableManager() {
+                return s_app_page_table_manager;
+            }
+
+            static ALWAYS_INLINE KPageTableManager &GetSystemPageTableManager() {
+                return s_sys_page_table_manager;
             }
 
             static ALWAYS_INLINE KSupervisorPageTable &GetKernelPageTable() {

libraries/libmesosphere/include/mesosphere/kern_slab_helpers.hpp

@@ -64,13 +64,11 @@ namespace ams::kern {
             static size_t GetNumRemaining() { return s_slab_heap.GetNumRemaining(); }
     };
 
-    template<typename Derived, typename Base, bool SupportDynamicExpansion> requires std::derived_from<Base, KAutoObject>
-    class KAutoObjectWithSlabHeapBase : public Base {
-        private:
-            template<typename, typename, bool> friend class KAutoObjectWithSlabHeap;
-            template<typename, typename, bool> friend class KAutoObjectWithSlabHeapAndContainer;
+    template<typename Derived, typename Base, bool SupportDynamicExpansion = false> requires std::derived_from<Base, KAutoObjectWithList>
+    class KAutoObjectWithSlabHeapAndContainer : public Base {
         private:
             static constinit inline KSlabHeap<Derived, SupportDynamicExpansion> s_slab_heap;
+            static constinit inline KAutoObjectWithListContainer<Derived> s_container;
         private:
             static ALWAYS_INLINE Derived *Allocate() {
                 return s_slab_heap.Allocate();
@@ -79,6 +77,12 @@ namespace ams::kern {
             static ALWAYS_INLINE void Free(Derived *obj) {
                 s_slab_heap.Free(obj);
             }
+        public:
+            class ListAccessor : public KAutoObjectWithListContainer<Derived>::ListAccessor {
+                public:
+                    ALWAYS_INLINE ListAccessor() : KAutoObjectWithListContainer<Derived>::ListAccessor(s_container) { /* ... */ }
+                    ALWAYS_INLINE ~ListAccessor() { /* ... */ }
+            };
         private:
             static ALWAYS_INLINE bool IsInitialized(const Derived *obj) {
                 if constexpr (requires { { obj->IsInitialized() } -> std::same_as<bool>; }) {
@@ -96,9 +100,9 @@ namespace ams::kern {
                 }
             }
         public:
-            constexpr explicit KAutoObjectWithSlabHeapBase(util::ConstantInitializeTag) : Base(util::ConstantInitialize) { /* ... */ }
+            constexpr explicit KAutoObjectWithSlabHeapAndContainer(util::ConstantInitializeTag) : Base(util::ConstantInitialize) { /* ... */ }
 
-            explicit KAutoObjectWithSlabHeapBase() { /* ... */ }
+            explicit KAutoObjectWithSlabHeapAndContainer() { /* ... */ }
 
             /* NOTE: IsInitialized() and GetPostDestroyArgument() are virtual functions declared in this class, */
             /* in Nintendo's kernel. We fully devirtualize them, as Destroy() is the only user of them. */
@@ -106,14 +110,14 @@ namespace ams::kern {
             virtual void Destroy() override final {
                 Derived * const derived = static_cast<Derived *>(this);
 
-                if (KAutoObjectWithSlabHeapBase<Derived, Base, SupportDynamicExpansion>::IsInitialized(derived)) {
-                    Derived::PreFinalize(derived);
-                    const uintptr_t arg = KAutoObjectWithSlabHeapBase<Derived, Base, SupportDynamicExpansion>::GetPostDestroyArgument(derived);
+                if (IsInitialized(derived)) {
+                    s_container.Unregister(derived);
+                    const uintptr_t arg = GetPostDestroyArgument(derived);
                     derived->Finalize();
-                    KAutoObjectWithSlabHeapBase<Derived, Base, SupportDynamicExpansion>::Free(derived);
+                    Free(derived);
                     Derived::PostDestroy(arg);
                 } else {
-                    KAutoObjectWithSlabHeapBase<Derived, Base, SupportDynamicExpansion>::Free(derived);
+                    Free(derived);
                 }
             }
 
@@ -123,6 +127,7 @@ namespace ams::kern {
         public:
             static void InitializeSlabHeap(void *memory, size_t memory_size) {
                 s_slab_heap.Initialize(memory, memory_size);
+                s_container.Initialize();
             }
 
             static Derived *Create() {
@@ -145,6 +150,10 @@ namespace ams::kern {
                 return obj;
             }
 
+            static void Register(Derived *obj) {
+                return s_container.Register(obj);
+            }
+
             static size_t GetObjectSize() { return s_slab_heap.GetObjectSize(); }
             static size_t GetSlabHeapSize() { return s_slab_heap.GetSlabHeapSize(); }
             static size_t GetPeakIndex() { return s_slab_heap.GetPeakIndex(); }
@@ -153,42 +162,4 @@ namespace ams::kern {
             static size_t GetNumRemaining() { return s_slab_heap.GetNumRemaining(); }
     };
 
-    template<typename Derived, typename Base, bool SupportDynamicExpansion = false>
-    class KAutoObjectWithSlabHeap : public KAutoObjectWithSlabHeapBase<Derived, Base, SupportDynamicExpansion> {
-        public:
-            constexpr explicit KAutoObjectWithSlabHeap(util::ConstantInitializeTag) : KAutoObjectWithSlabHeapBase<Derived, Base, SupportDynamicExpansion>(util::ConstantInitialize) { /* ... */ }
-
-            explicit KAutoObjectWithSlabHeap() { /* ... */ }
-
-            static ALWAYS_INLINE void PreFinalize(Derived *) { /* ... */ }
-    };
-
-
-    template<typename Derived, typename Base, bool SupportDynamicExpansion = false> requires std::derived_from<Base, KAutoObjectWithList>
-    class KAutoObjectWithSlabHeapAndContainer : public KAutoObjectWithSlabHeapBase<Derived, Base, SupportDynamicExpansion> {
-        private:
-            static constinit inline KAutoObjectWithListContainer<Derived> s_container;
-        public:
-            class ListAccessor : public KAutoObjectWithListContainer<Derived>::ListAccessor {
-                public:
-                    ALWAYS_INLINE ListAccessor() : KAutoObjectWithListContainer<Derived>::ListAccessor(s_container) { /* ... */ }
-                    ALWAYS_INLINE ~ListAccessor() { /* ... */ }
-            };
-        public:
-            constexpr explicit KAutoObjectWithSlabHeapAndContainer(util::ConstantInitializeTag) : KAutoObjectWithSlabHeapBase<Derived, Base, SupportDynamicExpansion>(util::ConstantInitialize) { /* ... */ }
-
-            explicit KAutoObjectWithSlabHeapAndContainer() { /* ... */ }
-        public:
-            static void InitializeSlabHeap(void *memory, size_t memory_size) {
-                KAutoObjectWithSlabHeapBase<Derived, Base, SupportDynamicExpansion>::InitializeSlabHeap(memory, memory_size);
-                s_container.Initialize();
-            }
-
-            static void Register(Derived *obj) {
-                return s_container.Register(obj);
-            }
-
-            static ALWAYS_INLINE void PreFinalize(Derived *obj) { s_container.Unregister(obj); }
-    };
-
 }

libraries/libmesosphere/source/arch/arm64/kern_cpu.cpp

@@ -38,25 +38,6 @@ namespace ams::kern::arch::arm64::cpu {
                 ALWAYS_INLINE ~KScopedCoreMigrationDisable() { GetCurrentThread().EnableCoreMigration(); }
         };
 
-        class KScopedCacheMaintenance {
-            private:
-                bool m_active;
-            public:
-                ALWAYS_INLINE KScopedCacheMaintenance() {
-                    __asm__ __volatile__("" ::: "memory");
-                    if (m_active = !GetCurrentThread().IsInCacheMaintenanceOperation(); m_active) {
-                        GetCurrentThread().SetInCacheMaintenanceOperation();
-                    }
-                }
-
-                ALWAYS_INLINE ~KScopedCacheMaintenance() {
-                    if (m_active) {
-                        GetCurrentThread().ClearInCacheMaintenanceOperation();
-                    }
-                    __asm__ __volatile__("" ::: "memory");
-                }
-        };
-
         /* Nintendo registers a handler for a SGI on thread termination, but does not handle anything. */
         /* This is sufficient, because post-interrupt scheduling is all they really intend to occur. */
         class KThreadTerminationInterruptHandler : public KInterruptHandler {
@@ -451,7 +432,9 @@ namespace ams::kern::arch::arm64::cpu {
 
     Result InvalidateDataCache(void *addr, size_t size) {
         /* Mark ourselves as in a cache maintenance operation, and prevent re-ordering. */
-        KScopedCacheMaintenance cm;
+        __asm__ __volatile__("" ::: "memory");
+        GetCurrentThread().SetInCacheMaintenanceOperation();
+        ON_SCOPE_EXIT { GetCurrentThread().ClearInCacheMaintenanceOperation(); __asm__ __volatile__("" ::: "memory"); };
 
         const uintptr_t start = reinterpret_cast<uintptr_t>(addr);
         const uintptr_t end   = start + size;
@@ -477,7 +460,9 @@ namespace ams::kern::arch::arm64::cpu {
 
     Result StoreDataCache(const void *addr, size_t size) {
         /* Mark ourselves as in a cache maintenance operation, and prevent re-ordering. */
-        KScopedCacheMaintenance cm;
+        __asm__ __volatile__("" ::: "memory");
+        GetCurrentThread().SetInCacheMaintenanceOperation();
+        ON_SCOPE_EXIT { GetCurrentThread().ClearInCacheMaintenanceOperation(); __asm__ __volatile__("" ::: "memory"); };
 
         const uintptr_t start = util::AlignDown(reinterpret_cast<uintptr_t>(addr),        DataCacheLineSize);
         const uintptr_t end   = util::AlignUp(  reinterpret_cast<uintptr_t>(addr) + size, DataCacheLineSize);
@@ -487,7 +472,9 @@ namespace ams::kern::arch::arm64::cpu {
 
     Result FlushDataCache(const void *addr, size_t size) {
         /* Mark ourselves as in a cache maintenance operation, and prevent re-ordering. */
-        KScopedCacheMaintenance cm;
+        __asm__ __volatile__("" ::: "memory");
+        GetCurrentThread().SetInCacheMaintenanceOperation();
+        ON_SCOPE_EXIT { GetCurrentThread().ClearInCacheMaintenanceOperation(); __asm__ __volatile__("" ::: "memory"); };
 
         const uintptr_t start = util::AlignDown(reinterpret_cast<uintptr_t>(addr),        DataCacheLineSize);
         const uintptr_t end   = util::AlignUp(  reinterpret_cast<uintptr_t>(addr) + size, DataCacheLineSize);

libraries/libmesosphere/source/arch/arm64/kern_exception_handlers.cpp

@@ -25,6 +25,8 @@ namespace ams::kern::arch::arm64 {
 
     namespace {
 
+        constexpr inline u32 El0PsrMask = 0xFF0FFE20;
+
         enum EsrEc : u32 {
             EsrEc_Unknown                   = 0b000000,
             EsrEc_WaitForInterruptOrEvent   = 0b000001,
@@ -132,7 +134,7 @@ namespace ams::kern::arch::arm64 {
                         info->sp     = context->sp;
                         info->lr     = context->x[30];
                         info->pc     = context->pc;
-                        info->pstate = (context->psr & cpu::El0Aarch64PsrMask);
+                        info->pstate = (context->psr & El0PsrMask);
                         info->afsr0  = afsr0;
                         info->afsr1  = afsr1;
                         info->esr    = esr;
@@ -149,7 +151,7 @@ namespace ams::kern::arch::arm64 {
                         info->pc     = context->pc;
                         info->flags  = 1;
 
-                        info->status_64.pstate = (context->psr & cpu::El0Aarch32PsrMask);
+                        info->status_64.pstate = (context->psr & El0PsrMask);
                         info->status_64.afsr0  = afsr0;
                         info->status_64.afsr1  = afsr1;
                         info->status_64.esr    = esr;
@@ -229,71 +231,73 @@ namespace ams::kern::arch::arm64 {
 
             {
                 /* Collect additional information based on the ec. */
-                uintptr_t params[3] = {};
+                ams::svc::DebugException exception;
+                uintptr_t param2 = 0;
+                uintptr_t param3 = 0;
                 switch (ec) {
                      case EsrEc_Unknown:
                      case EsrEc_IllegalExecution:
                      case EsrEc_BkptInstruction:
                      case EsrEc_BrkInstruction:
                          {
-                             params[0] = ams::svc::DebugException_UndefinedInstruction;
-                             params[1] = far;
-                             params[2] = data;
+                             exception = ams::svc::DebugException_UndefinedInstruction;
+                             param2 = far;
+                             param3 = data;
                          }
                          break;
                      case EsrEc_PcAlignmentFault:
                      case EsrEc_SpAlignmentFault:
                          {
-                             params[0] = ams::svc::DebugException_AlignmentFault;
-                             params[1]    = far;
+                             exception = ams::svc::DebugException_AlignmentFault;
+                             param2    = far;
                          }
                          break;
                      case EsrEc_Svc32:
                      case EsrEc_Svc64:
                          {
-                             params[0] = ams::svc::DebugException_UndefinedSystemCall;
-                             params[1] = far;
-                             params[2] = (esr & 0xFF);
+                             exception = ams::svc::DebugException_UndefinedSystemCall;
+                             param2 = far;
+                             param3 = (esr & 0xFF);
                          }
                          break;
                      case EsrEc_BreakPointEl0:
                      case EsrEc_SoftwareStepEl0:
                          {
-                             params[0] = ams::svc::DebugException_BreakPoint;
-                             params[1] = far;
-                             params[2] = ams::svc::BreakPointType_HardwareInstruction;
+                             exception = ams::svc::DebugException_BreakPoint;
+                             param2    = far;
+                             param3    = ams::svc::BreakPointType_HardwareInstruction;
                          }
                          break;
                      case EsrEc_WatchPointEl0:
                          {
-                             params[0] = ams::svc::DebugException_BreakPoint;
-                             params[1] = far;
-                             params[2] = ams::svc::BreakPointType_HardwareData;
+                             exception = ams::svc::DebugException_BreakPoint;
+                             param2    = far;
+                             param3    = ams::svc::BreakPointType_HardwareData;
                          }
                          break;
                      case EsrEc_SErrorInterrupt:
                          {
-                             params[0] = ams::svc::DebugException_MemorySystemError;
-                             params[1] = far;
+                             exception = ams::svc::DebugException_MemorySystemError;
+                             param2    = far;
                          }
                          break;
                      case EsrEc_InstructionAbortEl0:
                          {
-                             params[0] = ams::svc::DebugException_InstructionAbort;
-                             params[1] = far;
+                             exception = ams::svc::DebugException_InstructionAbort;
+                             param2    = far;
                          }
                          break;
                      case EsrEc_DataAbortEl0:
                      default:
                          {
-                             params[0] = ams::svc::DebugException_DataAbort;
-                             params[1] = far;
+                             exception = ams::svc::DebugException_DataAbort;
+                             param2    = far;
                          }
                          break;
                 }
 
                 /* Process the debug event. */
-                Result result = KDebug::OnDebugEvent(ams::svc::DebugEvent_Exception, params, util::size(params));
+                Result result = KDebug::OnDebugEvent(ams::svc::DebugEvent_Exception, exception, param2, param3);
 
                 /* If we should stop processing the exception, do so. */
                 if (svc::ResultStopProcessingException::Includes(result)) {
@@ -338,7 +342,7 @@ namespace ams::kern::arch::arm64 {
                 /* If the SVC is handled, handle it. */
                 if (!svc::ResultNotHandled::Includes(result)) {
                     /* If we successfully enter jit debug, stop processing the exception. */
-                    if (cur_process.EnterJitDebug(ams::svc::DebugEvent_Exception, static_cast<ams::svc::DebugException>(params[0]), params[1], params[2])) {
+                    if (cur_process.EnterJitDebug(ams::svc::DebugEvent_Exception, exception, param2, param3)) {
                         return;
                     }
                 }
@@ -395,7 +399,7 @@ namespace ams::kern::arch::arm64 {
                 e_ctx->x[30] = info.info64.lr;
                 e_ctx->sp    = info.info64.sp;
                 e_ctx->pc    = info.info64.pc;
-                e_ctx->psr   = (info.info64.pstate & cpu::El0Aarch64PsrMask) | (e_ctx->psr & ~cpu::El0Aarch64PsrMask);
+                e_ctx->psr   = (info.info64.pstate & El0PsrMask) | (e_ctx->psr & ~El0PsrMask);
             } else {
                 for (size_t i = 0; i < util::size(info.info32.r); ++i) {
                     e_ctx->x[i] = info.info32.r[i];
@@ -403,7 +407,7 @@ namespace ams::kern::arch::arm64 {
                 e_ctx->x[14] = info.info32.lr;
                 e_ctx->x[13] = info.info32.sp;
                 e_ctx->pc    = info.info32.pc;
-                e_ctx->psr   = (info.info32.status_64.pstate & cpu::El0Aarch32PsrMask) | (e_ctx->psr & ~cpu::El0Aarch32PsrMask);
+                e_ctx->psr   = (info.info32.status_64.pstate & El0PsrMask) | (e_ctx->psr & ~El0PsrMask);
             }
 
             /* Note that PC was adjusted. */
@@ -418,56 +422,58 @@ namespace ams::kern::arch::arm64 {
                 GetCurrentThread().RestoreDebugParams(std::addressof(far), std::addressof(esr), std::addressof(data));
 
                 /* Collect additional information based on the ec. */
-                uintptr_t params[3] = {};
+                ams::svc::DebugException exception;
+                uintptr_t param2 = 0;
+                uintptr_t param3 = 0;
                 switch ((esr >> 26) & 0x3F) {
                      case EsrEc_Unknown:
                      case EsrEc_IllegalExecution:
                      case EsrEc_BkptInstruction:
                      case EsrEc_BrkInstruction:
                          {
-                             params[0] = ams::svc::DebugException_UndefinedInstruction;
-                             params[1] = far;
-                             params[2] = data;
+                             exception = ams::svc::DebugException_UndefinedInstruction;
+                             param2    = far;
+                             param3    = data;
                          }
                          break;
                      case EsrEc_PcAlignmentFault:
                      case EsrEc_SpAlignmentFault:
                          {
-                             params[0] = ams::svc::DebugException_AlignmentFault;
-                             params[1] = far;
+                             exception = ams::svc::DebugException_AlignmentFault;
+                             param2    = far;
                          }
                          break;
                      case EsrEc_Svc32:
                      case EsrEc_Svc64:
                          {
-                             params[0] = ams::svc::DebugException_UndefinedSystemCall;
-                             params[1] = far;
-                             params[2] = (esr & 0xFF);
+                             exception = ams::svc::DebugException_UndefinedSystemCall;
+                             param2    = far;
+                             param3    = (esr & 0xFF);
                          }
                          break;
                      case EsrEc_SErrorInterrupt:
                          {
-                             params[0] = ams::svc::DebugException_MemorySystemError;
-                             params[1] = far;
+                             exception = ams::svc::DebugException_MemorySystemError;
+                             param2    = far;
                          }
                          break;
                      case EsrEc_InstructionAbortEl0:
                          {
-                             params[0] = ams::svc::DebugException_InstructionAbort;
-                             params[1] = far;
+                             exception = ams::svc::DebugException_InstructionAbort;
+                             param2    = far;
                          }
                          break;
                      case EsrEc_DataAbortEl0:
                      default:
                          {
-                             params[0] = ams::svc::DebugException_DataAbort;
-                             params[1] = far;
+                             exception = ams::svc::DebugException_DataAbort;
+                             param2    = far;
                          }
                          break;
                 }
 
                 /* Process the debug event. */
-                Result result = KDebug::OnDebugEvent(ams::svc::DebugEvent_Exception, params, util::size(params));
+                Result result = KDebug::OnDebugEvent(ams::svc::DebugEvent_Exception, exception, param2, param3);
 
                 /* If the SVC is handled, handle it. */
                 if (!svc::ResultNotHandled::Includes(result)) {
@@ -477,7 +483,7 @@ namespace ams::kern::arch::arm64 {
                     }
 
                     /* If we successfully enter jit debug, restore. */
-                    if (cur_process.EnterJitDebug(ams::svc::DebugEvent_Exception, static_cast<ams::svc::DebugException>(params[0]), params[1], params[2])) {
+                    if (cur_process.EnterJitDebug(ams::svc::DebugEvent_Exception, exception, param2, param3)) {
                         svc::RestoreContext(reinterpret_cast<uintptr_t>(e_ctx));
                     }
                 }

libraries/libmesosphere/source/arch/arm64/kern_k_debug.cpp

@@ -37,6 +37,8 @@ namespace ams::kern::arch::arm64 {
 
         static_assert(ForbiddenWatchPointFlagsMask == 0xFFFFFFFF00F0E006ul);
 
+        constexpr inline u32 El0PsrMask = 0xFF0FFE20;
+
     }
 
     uintptr_t KDebug::GetProgramCounter(const KThread &thread) {
@@ -102,7 +104,7 @@ namespace ams::kern::arch::arm64 {
                 out->lr     = e_ctx->x[30];
                 out->sp     = e_ctx->sp;
                 out->pc     = e_ctx->pc;
-                out->pstate = (e_ctx->psr & cpu::El0Aarch64PsrMask);
+                out->pstate = (e_ctx->psr & El0PsrMask);
 
                 /* Adjust PC if we should. */
                 if (e_ctx->write == 0 && thread->IsCallingSvc()) {
@@ -117,7 +119,7 @@ namespace ams::kern::arch::arm64 {
                 out->lr     = 0;
                 out->sp     = 0;
                 out->pc     = e_ctx->pc;
-                out->pstate = (e_ctx->psr & cpu::El0Aarch32PsrMask);
+                out->pstate = (e_ctx->psr & El0PsrMask);
 
                 /* Adjust PC if we should. */
                 if (e_ctx->write == 0 && thread->IsCallingSvc()) {
@@ -164,7 +166,7 @@ namespace ams::kern::arch::arm64 {
                 e_ctx->x[30] = ctx.lr;
                 e_ctx->sp    = ctx.sp;
                 e_ctx->pc    = ctx.pc;
-                e_ctx->psr   = ((ctx.pstate & cpu::El0Aarch64PsrMask) | (e_ctx->psr & ~cpu::El0Aarch64PsrMask));
+                e_ctx->psr   = ((ctx.pstate & El0PsrMask) | (e_ctx->psr & ~El0PsrMask));
                 e_ctx->tpidr = ctx.tpidr;
             } else {
                 e_ctx->x[13] = static_cast<u32>(ctx.r[13]);
@@ -172,7 +174,7 @@ namespace ams::kern::arch::arm64 {
                 e_ctx->x[30] = 0;
                 e_ctx->sp    = 0;
                 e_ctx->pc    = static_cast<u32>(ctx.pc);
-                e_ctx->psr   = ((ctx.pstate & cpu::El0Aarch32PsrMask) | (e_ctx->psr & ~cpu::El0Aarch32PsrMask));
+                e_ctx->psr   = ((ctx.pstate & El0PsrMask) | (e_ctx->psr & ~El0PsrMask));
                 e_ctx->tpidr = ctx.tpidr;
             }
         }
@@ -249,8 +251,7 @@ namespace ams::kern::arch::arm64 {
     }
 
     Result KDebug::BreakIfAttached(ams::svc::BreakReason break_reason, uintptr_t address, size_t size) {
-        const uintptr_t params[5] = { ams::svc::DebugException_UserBreak, GetProgramCounter(GetCurrentThread()), break_reason, address, size };
-        R_RETURN(KDebugBase::OnDebugEvent(ams::svc::DebugEvent_Exception, params, util::size(params)));
+        R_RETURN(KDebugBase::OnDebugEvent(ams::svc::DebugEvent_Exception, ams::svc::DebugException_UserBreak, GetProgramCounter(GetCurrentThread()), break_reason, address, size));
     }
 
     #define MESOSPHERE_SET_HW_BREAK_POINT(ID, FLAGS, VALUE) \

libraries/libmesosphere/source/arch/arm64/kern_k_page_table.cpp

@@ -192,7 +192,7 @@ namespace ams::kern::arch::arm64 {
     Result KPageTable::InitializeForKernel(void *table, KVirtualAddress start, KVirtualAddress end) {
         /* Initialize basic fields. */
         m_asid = 0;
-        m_manager = Kernel::GetSystemSystemResource().GetPageTableManagerPointer();
+        m_manager = std::addressof(Kernel::GetSystemPageTableManager());
 
         /* Allocate a page for ttbr. */
         /* NOTE: It is a postcondition of page table manager allocation that the page is all-zero. */
@@ -207,7 +207,7 @@ namespace ams::kern::arch::arm64 {
         R_SUCCEED();
     }
 
-    Result KPageTable::InitializeForProcess(u32 id, ams::svc::CreateProcessFlag as_type, bool enable_aslr, bool enable_das_merge, bool from_back, KMemoryManager::Pool pool, KProcessAddress code_address, size_t code_size, KSystemResource *system_resource, KResourceLimit *resource_limit) {
+    Result KPageTable::InitializeForProcess(u32 id, ams::svc::CreateProcessFlag as_type, bool enable_aslr, bool enable_das_merge, bool from_back, KMemoryManager::Pool pool, KProcessAddress code_address, size_t code_size, KMemoryBlockSlabManager *mem_block_slab_manager, KBlockInfoManager *block_info_manager, KPageTableManager *pt_manager, KResourceLimit *resource_limit) {
         /* The input ID isn't actually used. */
         MESOSPHERE_UNUSED(id);
 
@@ -216,7 +216,7 @@ namespace ams::kern::arch::arm64 {
         ON_RESULT_FAILURE { g_asid_manager.Release(m_asid); };
 
         /* Set our manager. */
-        m_manager = system_resource->GetPageTableManagerPointer();
+        m_manager = pt_manager;
 
         /* Allocate a new table, and set our ttbr value. */
         const KVirtualAddress new_table = m_manager->Allocate();
@@ -228,7 +228,7 @@ namespace ams::kern::arch::arm64 {
         const size_t as_width = GetAddressSpaceWidth(as_type);
         const KProcessAddress as_start = 0;
         const KProcessAddress as_end   = (1ul << as_width);
-        R_TRY(KPageTableBase::InitializeForProcess(as_type, enable_aslr, enable_das_merge, from_back, pool, GetVoidPointer(new_table), as_start, as_end, code_address, code_size, system_resource, resource_limit));
+        R_TRY(KPageTableBase::InitializeForProcess(as_type, enable_aslr, enable_das_merge, from_back, pool, GetVoidPointer(new_table), as_start, as_end, code_address, code_size, mem_block_slab_manager, block_info_manager, resource_limit));
 
         /* Note that we've updated the table (since we created it). */
         this->NoteUpdated();
@@ -348,7 +348,7 @@ namespace ams::kern::arch::arm64 {
         MESOSPHERE_ASSERT(util::IsAligned(GetInteger(virt_addr), PageSize));
         MESOSPHERE_ASSERT(this->ContainsPages(virt_addr, num_pages));
 
-        if (operation == OperationType_Map || operation == OperationType_MapFirst) {
+        if (operation == OperationType_Map) {
             MESOSPHERE_ABORT_UNLESS(is_pa_valid);
             MESOSPHERE_ASSERT(util::IsAligned(GetInteger(phys_addr), PageSize));
         } else {
@@ -357,32 +357,16 @@ namespace ams::kern::arch::arm64 {
 
         if (operation == OperationType_Unmap) {
             R_RETURN(this->Unmap(virt_addr, num_pages, page_list, false, reuse_ll));
-        } else if (operation == OperationType_Separate) {
-            const size_t size = num_pages * PageSize;
-            R_TRY(this->SeparatePages(virt_addr, std::min(util::GetAlignment(GetInteger(virt_addr)), size), page_list, reuse_ll));
-            ON_RESULT_FAILURE { this->MergePages(virt_addr, page_list); };
-
-            if (num_pages > 1) {
-                const auto end_page  = virt_addr + size;
-                const auto last_page = end_page - PageSize;
-
-                R_TRY(this->SeparatePages(last_page, std::min(util::GetAlignment(GetInteger(end_page)), size), page_list, reuse_ll));
-            }
-
-            R_SUCCEED();
         } else {
             auto entry_template = this->GetEntryTemplate(properties);
 
             switch (operation) {
                 case OperationType_Map:
-                case OperationType_MapFirst:
-                    R_RETURN(this->MapContiguous(virt_addr, phys_addr, num_pages, entry_template, properties.disable_merge_attributes == DisableMergeAttribute_DisableHead, operation != OperationType_MapFirst, page_list, reuse_ll));
+                    R_RETURN(this->MapContiguous(virt_addr, phys_addr, num_pages, entry_template, properties.disable_merge_attributes == DisableMergeAttribute_DisableHead, page_list, reuse_ll));
                 case OperationType_ChangePermissions:
-                    R_RETURN(this->ChangePermissions(virt_addr, num_pages, entry_template, properties.disable_merge_attributes, false, false, page_list, reuse_ll));
+                    R_RETURN(this->ChangePermissions(virt_addr, num_pages, entry_template, properties.disable_merge_attributes, false, page_list, reuse_ll));
                 case OperationType_ChangePermissionsAndRefresh:
-                    R_RETURN(this->ChangePermissions(virt_addr, num_pages, entry_template, properties.disable_merge_attributes, true, false, page_list, reuse_ll));
-                case OperationType_ChangePermissionsAndRefreshAndFlush:
-                    R_RETURN(this->ChangePermissions(virt_addr, num_pages, entry_template, properties.disable_merge_attributes, true, true, page_list, reuse_ll));
+                    R_RETURN(this->ChangePermissions(virt_addr, num_pages, entry_template, properties.disable_merge_attributes, true, page_list, reuse_ll));
                 MESOSPHERE_UNREACHABLE_DEFAULT_CASE();
             }
         }
@@ -756,7 +740,7 @@ namespace ams::kern::arch::arm64 {
         R_SUCCEED();
     }
 
-    Result KPageTable::MapContiguous(KProcessAddress virt_addr, KPhysicalAddress phys_addr, size_t num_pages, PageTableEntry entry_template, bool disable_head_merge, bool not_first, PageLinkedList *page_list, bool reuse_ll) {
+    Result KPageTable::MapContiguous(KProcessAddress virt_addr, KPhysicalAddress phys_addr, size_t num_pages, PageTableEntry entry_template, bool disable_head_merge, PageLinkedList *page_list, bool reuse_ll) {
         MESOSPHERE_ASSERT(this->IsLockedByCurrentThread());
 
         /* Cache initial addresses for use on cleanup. */
@@ -827,11 +811,7 @@ namespace ams::kern::arch::arm64 {
 
         /* Open references to the pages, if we should. */
         if (IsHeapPhysicalAddress(orig_phys_addr)) {
-            if (not_first) {
-                Kernel::GetMemoryManager().Open(orig_phys_addr, num_pages);
-            } else {
-                Kernel::GetMemoryManager().OpenFirst(orig_phys_addr, num_pages);
-            }
+            Kernel::GetMemoryManager().Open(orig_phys_addr, num_pages);
         }
 
         R_SUCCEED();
@@ -1235,7 +1215,7 @@ namespace ams::kern::arch::arm64 {
         R_RETURN(this->SeparatePagesImpl(virt_addr, block_size, page_list, reuse_ll));
     }
 
-    Result KPageTable::ChangePermissions(KProcessAddress virt_addr, size_t num_pages, PageTableEntry entry_template, DisableMergeAttribute disable_merge_attr, bool refresh_mapping, bool flush_mapping, PageLinkedList *page_list, bool reuse_ll) {
+    Result KPageTable::ChangePermissions(KProcessAddress virt_addr, size_t num_pages, PageTableEntry entry_template, DisableMergeAttribute disable_merge_attr, bool refresh_mapping, PageLinkedList *page_list, bool reuse_ll) {
         MESOSPHERE_ASSERT(this->IsLockedByCurrentThread());
 
         /* Separate pages before we change permissions. */
@@ -1453,8 +1433,8 @@ namespace ams::kern::arch::arm64 {
                 KScopedSchedulerLock sl;
             }
 
-            /* Finally, apply the changes as directed, flushing the mappings before they're applied (if we should). */
-            ApplyEntryTemplate(entry_template, flush_mapping ? ApplyOption_FlushDataCache : ApplyOption_None);
+            /* Finally, apply the changes as directed, flushing the mappings before they're applied. */
+            ApplyEntryTemplate(entry_template, ApplyOption_FlushDataCache);
         }
 
         /* We've succeeded, now perform what coalescing we can. */

libraries/libmesosphere/source/arch/arm64/kern_k_page_table_impl.cpp

@@ -353,12 +353,12 @@ namespace ams::kern::arch::arm64 {
                                                                                                                                                                         l1_entry->IsPrivilegedExecuteNever(),
                                                                                                                                                                         l1_entry->IsContiguous(),
                                                                                                                                                                         !l1_entry->IsGlobal(),
-                                                                                                                                                                        static_cast<int>(l1_entry->GetAccessFlagInteger()),
-                                                                                                                                                                        static_cast<unsigned int>(l1_entry->GetShareableInteger()),
+                                                                                                                                                                        static_cast<int>(l1_entry->GetAccessFlag()),
+                                                                                                                                                                        static_cast<unsigned int>(l1_entry->GetShareable()),
                                                                                                                                                                         l1_entry->IsReadOnly(),
                                                                                                                                                                         l1_entry->IsUserAccessible(),
                                                                                                                                                                         l1_entry->IsNonSecure(),
-                                                                                                                                                                        static_cast<int>(l1_entry->GetPageAttributeInteger()),
+                                                                                                                                                                        static_cast<int>(l1_entry->GetPageAttribute()),
                                                                                                                                                                         l1_entry->IsHeadMergeDisabled(),
                                                                                                                                                                         l1_entry->IsHeadAndBodyMergeDisabled(),
                                                                                                                                                                         l1_entry->IsTailMergeDisabled());
@@ -398,12 +398,12 @@ namespace ams::kern::arch::arm64 {
                                                                                                                                                                         l2_entry->IsPrivilegedExecuteNever(),
                                                                                                                                                                         l2_entry->IsContiguous(),
                                                                                                                                                                         !l2_entry->IsGlobal(),
-                                                                                                                                                                        static_cast<int>(l2_entry->GetAccessFlagInteger()),
-                                                                                                                                                                        static_cast<unsigned int>(l2_entry->GetShareableInteger()),
+                                                                                                                                                                        static_cast<int>(l2_entry->GetAccessFlag()),
+                                                                                                                                                                        static_cast<unsigned int>(l2_entry->GetShareable()),
                                                                                                                                                                         l2_entry->IsReadOnly(),
                                                                                                                                                                         l2_entry->IsUserAccessible(),
                                                                                                                                                                         l2_entry->IsNonSecure(),
-                                                                                                                                                                        static_cast<int>(l2_entry->GetPageAttributeInteger()),
+                                                                                                                                                                        static_cast<int>(l2_entry->GetPageAttribute()),
                                                                                                                                                                         l2_entry->IsHeadMergeDisabled(),
                                                                                                                                                                         l2_entry->IsHeadAndBodyMergeDisabled(),
                                                                                                                                                                         l2_entry->IsTailMergeDisabled());
@@ -443,12 +443,12 @@ namespace ams::kern::arch::arm64 {
                                                                                                                                                                         l3_entry->IsPrivilegedExecuteNever(),
                                                                                                                                                                         l3_entry->IsContiguous(),
                                                                                                                                                                         !l3_entry->IsGlobal(),
-                                                                                                                                                                        static_cast<int>(l3_entry->GetAccessFlagInteger()),
-                                                                                                                                                                        static_cast<unsigned int>(l3_entry->GetShareableInteger()),
+                                                                                                                                                                        static_cast<int>(l3_entry->GetAccessFlag()),
+                                                                                                                                                                        static_cast<unsigned int>(l3_entry->GetShareable()),
                                                                                                                                                                         l3_entry->IsReadOnly(),
                                                                                                                                                                         l3_entry->IsUserAccessible(),
                                                                                                                                                                         l3_entry->IsNonSecure(),
-                                                                                                                                                                        static_cast<int>(l3_entry->GetPageAttributeInteger()),
+                                                                                                                                                                        static_cast<int>(l3_entry->GetPageAttribute()),
                                                                                                                                                                         l3_entry->IsHeadMergeDisabled(),
                                                                                                                                                                         l3_entry->IsHeadAndBodyMergeDisabled(),
                                                                                                                                                                         l3_entry->IsTailMergeDisabled());

libraries/libmesosphere/source/arch/arm64/kern_k_thread_context.cpp

@@ -26,9 +26,7 @@ namespace ams::kern::arch::arm64 {
         /* Send KDebug event for this thread's creation. */
         {
             KScopedInterruptEnable ei;
-
-            const uintptr_t params[2] = { GetCurrentThread().GetId(), GetInteger(GetCurrentThread().GetThreadLocalRegionAddress()) };
-            KDebug::OnDebugEvent(ams::svc::DebugEvent_CreateThread, params, util::size(params));
+            KDebug::OnDebugEvent(ams::svc::DebugEvent_CreateThread, GetCurrentThread().GetId(), GetInteger(GetCurrentThread().GetThreadLocalRegionAddress()));
         }
 
         /* Handle any pending dpc. */
@@ -42,6 +40,8 @@ namespace ams::kern::arch::arm64 {
 
     namespace {
 
+        constexpr inline u32 El0PsrMask = 0xFF0FFE20;
+
         ALWAYS_INLINE bool IsFpuEnabled() {
             return cpu::ArchitecturalFeatureAccessControlRegisterAccessor().IsFpEnabled();
         }
@@ -96,8 +96,8 @@ namespace ams::kern::arch::arm64 {
             /* SP                                                                        */
             /* |                                                                         */
             /* v                                                                         */
-            /* | u64 argument | u64 entrypoint | KThread::StackParameters (size 0x140) | */
-            static_assert(sizeof(KThread::StackParameters) == 0x140);
+            /* | u64 argument | u64 entrypoint | KThread::StackParameters (size 0x130) | */
+            static_assert(sizeof(KThread::StackParameters) == 0x130);
 
             u64 *stack = GetPointer<u64>(sp);
             *(--stack) = GetInteger(pc);
@@ -191,7 +191,7 @@ namespace ams::kern::arch::arm64 {
             out->lr     = e_ctx->x[30];
             out->sp     = e_ctx->sp;
             out->pc     = e_ctx->pc;
-            out->pstate = e_ctx->psr & cpu::El0Aarch64PsrMask;
+            out->pstate = e_ctx->psr & El0PsrMask;
 
             /* Get the thread's general purpose registers. */
             if (thread->IsCallingSvc()) {
@@ -227,7 +227,7 @@ namespace ams::kern::arch::arm64 {
         } else {
             /* Set special registers. */
             out->pc     = static_cast<u32>(e_ctx->pc);
-            out->pstate = e_ctx->psr & cpu::El0Aarch32PsrMask;
+            out->pstate = e_ctx->psr & El0PsrMask;
 
             /* Get the thread's general purpose registers. */
             for (size_t i = 0; i < 15; ++i) {

libraries/libmesosphere/source/arch/arm64/kern_userspace_memory_access_asm.s

@@ -596,11 +596,8 @@ _ZN3ams4kern4arch5arm6415UserspaceAccess17ReadIoMemory32BitEPvPKvm:
     /* Save our return address. */
     mov     x8, x30
 
-    /* Prepare return address for read failure. */
-    adr     x10, 4f
-
 1:  /* Set our return address so that on read failure we continue as though we read -1. */
-    mov     x30, x10
+    adr     x30, 4f
 
     /* Read the word from io. */
     ldtr    w9, [x5]
@@ -646,11 +643,8 @@ _ZN3ams4kern4arch5arm6415UserspaceAccess17ReadIoMemory16BitEPvPKvm:
     /* Save our return address. */
     mov     x8, x30
 
-    /* Prepare return address for read failure. */
-    adr     x10, 4f
-
 1:  /* Set our return address so that on read failure we continue as though we read -1. */
-    mov     x30, x10
+    adr     x30, 4f
 
     /* Read the word from io. */
     ldtrh   w9, [x5]
@@ -696,11 +690,8 @@ _ZN3ams4kern4arch5arm6415UserspaceAccess16ReadIoMemory8BitEPvPKvm:
     /* Save our return address. */
     mov     x8, x30
 
-    /* Prepare return address for read failure. */
-    adr     x10, 4f
-
 1:  /* Set our return address so that on read failure we continue as though we read -1. */
-    mov     x30, x10
+    adr     x30, 4f
 
     /* Read the word from io. */
     ldtrb   w9, [x5]
@@ -746,14 +737,11 @@ _ZN3ams4kern4arch5arm6415UserspaceAccess18WriteIoMemory32BitEPvPKvm:
     /* Save our return address. */
     mov     x8, x30
 
-    /* Prepare return address for failure. */
-    adr     x10, 2f
-
 1:  /* Read the word from normal memory. */
     ldtr    w9, [x5]
 
-    /* Set our return address so that on failure we continue. */
-    mov     x30, x10
+    /* Set our return address so that on read failure we continue. */
+    adr     x30, 2f
 
     /* Write the word to io. */
     sttr    w9, [x5]
@@ -791,14 +779,11 @@ _ZN3ams4kern4arch5arm6415UserspaceAccess18WriteIoMemory16BitEPvPKvm:
     /* Save our return address. */
     mov     x8, x30
 
-    /* Prepare return address for failure. */
-    adr     x10, 2f
-
 1:  /* Read the word from normal memory. */
     ldtrh   w9, [x5]
 
-    /* Set our return address so that on failure we continue. */
-    mov     x30, x10
+    /* Set our return address so that on read failure we continue. */
+    adr     x30, 2f
 
     /* Write the word to io. */
     sttrh   w9, [x5]
@@ -836,14 +821,11 @@ _ZN3ams4kern4arch5arm6415UserspaceAccess17WriteIoMemory8BitEPvPKvm:
     /* Save our return address. */
     mov     x8, x30
 
-    /* Prepare return address for failure. */
-    adr     x10, 2f
-
 1:  /* Read the word from normal memory. */
     ldtrb   w9, [x5]
 
-    /* Set our return address so that on failure we continue. */
-    mov     x30, x10
+    /* Set our return address so that on read failure we continue. */
+    adr     x30, 2f
 
     /* Write the word to io. */
     sttrb   w9, [x5]

libraries/libmesosphere/source/arch/arm64/svc/kern_svc_exception_asm.s

@@ -86,10 +86,9 @@ _ZN3ams4kern3svc14RestoreContextEm:
     /* Get our exception flags. */
     ldrb    w9, [sp, #(EXCEPTION_CONTEXT_SIZE + THREAD_STACK_PARAMETERS_EXCEPTION_FLAGS)]
 
-    /* Clear in-svc, in-user-exception, and needs-fpu-restore flags. */
+    /* Clear in-svc and needs-fpu-restore flags. */
     and     w10, w9,  #(~(THREAD_EXCEPTION_FLAG_IS_FPU_CONTEXT_RESTORE_NEEDED))
     and     w10, w10, #(~(THREAD_EXCEPTION_FLAG_IS_CALLING_SVC))
-    and     w10, w10, #(~(THREAD_EXCEPTION_FLAG_IS_IN_USERMODE_EXCEPTION_HANDLER))
     strb    w10, [sp, #(EXCEPTION_CONTEXT_SIZE + THREAD_STACK_PARAMETERS_EXCEPTION_FLAGS)]
 
     /* If we don't need to restore the fpu, skip restoring it. */

libraries/libmesosphere/source/board/nintendo/nx/kern_k_device_page_table.cpp

@@ -651,13 +651,11 @@ namespace ams::kern::board::nintendo::nx {
         g_memory_controller_address = KMemoryLayout::GetDevicePhysicalAddress(KMemoryRegionType_MemoryController);
 
         /* Allocate a page to use as a reserved/no device table. */
-        auto &ptm = Kernel::GetSystemSystemResource().GetPageTableManager();
-
-        const KVirtualAddress table_virt_addr = ptm.Allocate();
+        const KVirtualAddress table_virt_addr = Kernel::GetSystemPageTableManager().Allocate();
         MESOSPHERE_ABORT_UNLESS(table_virt_addr != Null<KVirtualAddress>);
         const KPhysicalAddress table_phys_addr = GetPageTablePhysicalAddress(table_virt_addr);
         MESOSPHERE_ASSERT(IsValidPhysicalAddress(table_phys_addr));
-        ptm.Open(table_virt_addr, 1);
+        Kernel::GetSystemPageTableManager().Open(table_virt_addr, 1);
 
         /* Save the page. Note that it is a pre-condition that the page is cleared, when allocated from the system page table manager. */
         /* NOTE: Nintendo does not check the result of StoreDataCache. */
@@ -781,7 +779,7 @@ namespace ams::kern::board::nintendo::nx {
         const size_t end_index   = (space_address + space_size - 1) / DeviceRegionSize;
 
         /* Get the page table manager. */
-        auto &ptm = Kernel::GetSystemSystemResource().GetPageTableManager();
+        auto &ptm = Kernel::GetSystemPageTableManager();
 
         /* Clear the tables. */
         static_assert(TableCount == (1ul << DeviceVirtualAddressBits) / DeviceRegionSize);
@@ -841,7 +839,7 @@ namespace ams::kern::board::nintendo::nx {
 
     void KDevicePageTable::Finalize() {
         /* Get the page table manager. */
-        auto &ptm = Kernel::GetSystemSystemResource().GetPageTableManager();
+        auto &ptm = Kernel::GetSystemPageTableManager();
 
         /* Detach from all devices. */
         {
@@ -1016,7 +1014,7 @@ namespace ams::kern::board::nintendo::nx {
 
         /* Get the memory manager and page table manager. */
         KMemoryManager &mm     = Kernel::GetMemoryManager();
-        KPageTableManager &ptm = Kernel::GetSystemSystemResource().GetPageTableManager();
+        KPageTableManager &ptm = Kernel::GetSystemPageTableManager();
 
         /* Cache permissions. */
         const bool read  = (device_perm & ams::svc::MemoryPermission_Read)  != 0;
@@ -1118,7 +1116,6 @@ namespace ams::kern::board::nintendo::nx {
     }
 
     Result KDevicePageTable::MapImpl(KProcessPageTable *page_table, KProcessAddress process_address, size_t size, KDeviceVirtualAddress device_address, ams::svc::MemoryPermission device_perm, bool is_aligned) {
-
         /* Ensure that the region we're mapping to is free. */
         R_UNLESS(this->IsFree(device_address, size), svc::ResultInvalidCurrentMemory());
 
@@ -1161,10 +1158,10 @@ namespace ams::kern::board::nintendo::nx {
 
         /* Get the memory manager and page table manager. */
         KMemoryManager &mm     = Kernel::GetMemoryManager();
-        KPageTableManager &ptm = Kernel::GetSystemSystemResource().GetPageTableManager();
+        KPageTableManager &ptm = Kernel::GetSystemPageTableManager();
 
         /* Make a page group for the pages we're closing. */
-        KPageGroup pg(Kernel::GetSystemSystemResource().GetBlockInfoManagerPointer());
+        KPageGroup pg(std::addressof(Kernel::GetSystemBlockInfoManager()));
 
         /* Walk the directory. */
         u64 remaining = size;
@@ -1417,15 +1414,11 @@ namespace ams::kern::board::nintendo::nx {
         return true;
     }
 
-    Result KDevicePageTable::Map(KProcessPageTable *page_table, KProcessAddress process_address, size_t size, KDeviceVirtualAddress device_address, ams::svc::MemoryPermission device_perm, bool is_aligned, bool is_io) {
+    Result KDevicePageTable::Map(KProcessPageTable *page_table, KProcessAddress process_address, size_t size, KDeviceVirtualAddress device_address, ams::svc::MemoryPermission device_perm, bool is_aligned) {
         /* Validate address/size. */
         MESOSPHERE_ASSERT((device_address & ~DeviceVirtualAddressMask) == 0);
         MESOSPHERE_ASSERT(((device_address + size - 1) & ~DeviceVirtualAddressMask) == 0);
 
-        /* IO is not supported on NX board. */
-        MESOSPHERE_ASSERT(!is_io);
-        MESOSPHERE_UNUSED(is_io);
-
         /* Map the pages. */
         R_RETURN(this->MapImpl(page_table, process_address, size, device_address, device_perm, is_aligned));
     }

libraries/libmesosphere/source/board/nintendo/nx/kern_k_sleep_manager.cpp

@@ -18,12 +18,6 @@
 #include "kern_secure_monitor.hpp"
 #include "kern_lps_driver.hpp"
 
-namespace ams::kern::init {
-
-    void StartOtherCore(const ams::kern::init::KInitArguments *init_args);
-
-}
-
 namespace ams::kern::board::nintendo::nx {
 
     namespace {
@@ -73,10 +67,15 @@ namespace ams::kern::board::nintendo::nx {
         constinit KLightLock g_request_lock;
         constinit KLightLock g_cv_lock;
         constinit KLightConditionVariable g_cv{util::ConstantInitialize};
+        constinit KPhysicalAddress g_sleep_buffer_phys_addrs[cpu::NumCores];
         alignas(1_KB) constinit u64 g_sleep_buffers[cpu::NumCores][1_KB / sizeof(u64)];
-        constinit ams::kern::init::KInitArguments g_sleep_init_arguments[cpu::NumCores];
         constinit SavedSystemRegisters g_sleep_system_registers[cpu::NumCores] = {};
 
+        void PowerOnCpu(int core_id, KPhysicalAddress entry_phys_addr, u64 context_id) {
+            /* Request the secure monitor power on the core. */
+            ::ams::kern::arch::arm64::smc::CpuOn<smc::SmcId_Supervisor, true>(cpu::MultiprocessorAffinityRegisterAccessor().GetCpuOnArgument() | core_id, GetInteger(entry_phys_addr), context_id);
+        }
+
         void WaitOtherCpuPowerOff() {
             constexpr u64 PmcPhysicalAddress = 0x7000E400;
             constexpr u32 PWRGATE_STATUS_CE123_MASK = ((1u << 3) - 1) << 9;
@@ -474,20 +473,18 @@ namespace ams::kern::board::nintendo::nx {
         }
     }
 
-    void KSleepManager::ProcessRequests(uintptr_t sleep_buffer) {
+    void KSleepManager::ProcessRequests(uintptr_t buffer) {
         const auto target_fw = GetTargetFirmware();
         const s32 core_id    = GetCurrentCoreId();
-
-        ams::kern::init::KInitArguments * const init_args = g_sleep_init_arguments + core_id;
-        KPhysicalAddress start_core_phys_addr = Null<KPhysicalAddress>;
-        KPhysicalAddress init_args_phys_addr = Null<KPhysicalAddress>;
+        KPhysicalAddress resume_entry_phys_addr = Null<KPhysicalAddress>;
 
         /* Get the physical addresses we'll need. */
         {
-            MESOSPHERE_ABORT_UNLESS(Kernel::GetKernelPageTable().GetPhysicalAddress(std::addressof(start_core_phys_addr), KProcessAddress(&::ams::kern::init::StartOtherCore)));
-            MESOSPHERE_ABORT_UNLESS(Kernel::GetKernelPageTable().GetPhysicalAddress(std::addressof(init_args_phys_addr), KProcessAddress(init_args)));
-        }
+            MESOSPHERE_ABORT_UNLESS(Kernel::GetKernelPageTable().GetPhysicalAddress(std::addressof(g_sleep_buffer_phys_addrs[core_id]), KProcessAddress(buffer)));
+            MESOSPHERE_ABORT_UNLESS(Kernel::GetKernelPageTable().GetPhysicalAddress(std::addressof(resume_entry_phys_addr), KProcessAddress(&::ams::kern::board::nintendo::nx::KSleepManager::ResumeEntry)));
 
+        }
+        const KPhysicalAddress sleep_buffer_phys_addr = g_sleep_buffer_phys_addrs[core_id];
         const u64 target_core_mask = (1ul << core_id);
 
         const bool use_legacy_lps_driver = target_fw < TargetFirmware_2_0_0;
@@ -550,29 +547,15 @@ namespace ams::kern::board::nintendo::nx {
                 /* Save the interrupt manager's state. */
                 Kernel::GetInterruptManager().Save(core_id);
 
-                /* Setup the initial arguments. */
-                {
-                    init_args->ttbr0      = cpu::GetTtbr0El1();
-                    init_args->ttbr1      = cpu::GetTtbr1El1();
-                    init_args->tcr        = cpu::GetTcrEl1();
-                    init_args->mair       = cpu::GetMairEl1();
-                    init_args->cpuactlr   = cpu::GetCpuActlrEl1();
-                    init_args->cpuectlr   = cpu::GetCpuEctlrEl1();
-                    init_args->sctlr      = cpu::GetSctlrEl1();
-                    init_args->sp         = 0;
-                    init_args->entrypoint = reinterpret_cast<uintptr_t>(::ams::kern::board::nintendo::nx::KSleepManager::ResumeEntry);
-                    init_args->argument   = sleep_buffer;
-                }
-
                 /* Ensure that all cores get to this point before continuing. */
                 cpu::SynchronizeAllCores();
 
                 /* Log that the core is going to sleep. */
-                MESOSPHERE_LOG("Core[%d]: Going to sleep, buffer = %010lx\n", core_id, sleep_buffer);
+                MESOSPHERE_LOG("Core[%d]: Going to sleep, buffer = %010lx\n", core_id, GetInteger(sleep_buffer_phys_addr));
 
                 /* If we're on a core other than zero, we can just invoke the sleep handler. */
                 if (core_id != 0) {
-                    CpuSleepHandler(sleep_buffer, GetInteger(start_core_phys_addr), GetInteger(init_args_phys_addr));
+                    CpuSleepHandler(GetInteger(sleep_buffer_phys_addr), GetInteger(resume_entry_phys_addr));
                 } else {
                     /* Wait for all other cores to be powered off. */
                     WaitOtherCpuPowerOff();
@@ -591,9 +574,9 @@ namespace ams::kern::board::nintendo::nx {
                     /* Invoke the sleep handler. */
                     if (!use_legacy_lps_driver) {
                         /* When not using the legacy driver, invoke directly. */
-                        CpuSleepHandler(sleep_buffer, GetInteger(start_core_phys_addr), GetInteger(init_args_phys_addr));
+                        CpuSleepHandler(GetInteger(sleep_buffer_phys_addr), GetInteger(resume_entry_phys_addr));
                     } else {
-                        lps::InvokeCpuSleepHandler(sleep_buffer, GetInteger(start_core_phys_addr), GetInteger(init_args_phys_addr));
+                        lps::InvokeCpuSleepHandler(GetInteger(sleep_buffer_phys_addr), GetInteger(resume_entry_phys_addr));
                     }
 
                     /* Restore the debug log state. */
@@ -603,10 +586,8 @@ namespace ams::kern::board::nintendo::nx {
                     MESOSPHERE_LOG("Exiting SC7\n");
 
                     /* Wake up the other cores. */
-                    cpu::MultiprocessorAffinityRegisterAccessor mpidr;
-                    const auto arg = mpidr.GetCpuOnArgument();
                     for (s32 i = 1; i < static_cast<s32>(cpu::NumCores); ++i) {
-                        KSystemControl::Init::TurnOnCpu(arg | i, g_sleep_init_arguments + i);
+                        PowerOnCpu(i, resume_entry_phys_addr, GetInteger(g_sleep_buffer_phys_addrs[i]));
                     }
                 }
 

libraries/libmesosphere/source/board/nintendo/nx/kern_k_sleep_manager.hpp

@@ -22,12 +22,14 @@ namespace ams::kern::board::nintendo::nx {
         private:
             static void ResumeEntry(uintptr_t arg);
 
+            static void InvalidateDataCacheForResumeEntry(uintptr_t level);
+
             static void ProcessRequests(uintptr_t buffer);
         public:
             static void Initialize();
             static void SleepSystem();
         public:
-            static void CpuSleepHandler(uintptr_t arg, uintptr_t entry, uintptr_t entry_args);
+            static void CpuSleepHandler(uintptr_t arg, uintptr_t entry);
     };
 
 

libraries/libmesosphere/source/board/nintendo/nx/kern_k_sleep_manager_asm.s

@@ -22,14 +22,14 @@
     mov  reg, #(((val) >> 0x00) & 0xFFFF);         \
     movk reg, #(((val) >> 0x10) & 0xFFFF), lsl#16
 
-/* ams::kern::board::nintendo::nx::KSleepManager::CpuSleepHandler(uintptr_t arg, uintptr_t entry, uintptr_t entry_arg) */
-.section    .sleep._ZN3ams4kern5board8nintendo2nx13KSleepManager15CpuSleepHandlerEmmm, "ax", %progbits
-.global     _ZN3ams4kern5board8nintendo2nx13KSleepManager15CpuSleepHandlerEmmm
-.type       _ZN3ams4kern5board8nintendo2nx13KSleepManager15CpuSleepHandlerEmmm, %function
-_ZN3ams4kern5board8nintendo2nx13KSleepManager15CpuSleepHandlerEmmm:
+/* ams::kern::board::nintendo::nx::KSleepManager::CpuSleepHandler(uintptr_t arg, uintptr_t entry) */
+.section    .sleep._ZN3ams4kern5board8nintendo2nx13KSleepManager15CpuSleepHandlerEmm, "ax", %progbits
+.global     _ZN3ams4kern5board8nintendo2nx13KSleepManager15CpuSleepHandlerEmm
+.type       _ZN3ams4kern5board8nintendo2nx13KSleepManager15CpuSleepHandlerEmm, %function
+_ZN3ams4kern5board8nintendo2nx13KSleepManager15CpuSleepHandlerEmm:
     /* Save arguments. */
-    mov     x16, x1
-    mov     x17, x2
+    mov     x16, x0
+    mov     x17, x1
 
     /* Enable access to FPU registers. */
     mrs     x1, cpacr_el1
@@ -74,8 +74,28 @@ _ZN3ams4kern5board8nintendo2nx13KSleepManager15CpuSleepHandlerEmmm:
     stp     q28, q29, [x0], #0x20
     stp     q30, q31, [x0], #0x20
 
-    /* Save tpidr/cntv_cval_el0. */
-    mrs     x1, tpidr_el1
+    /* Save cpuactlr/cpuectlr. */
+    mrs     x1, cpuectlr_el1
+    mrs     x2, cpuactlr_el1
+    stp     x1, x2, [x0], #0x10
+
+    /* Save ttbr0/ttbr1. */
+    mrs     x1, ttbr0_el1
+    mrs     x2, ttbr1_el1
+    stp     x1, x2, [x0], #0x10
+
+    /* Save tcr/mair. */
+    mrs     x1, tcr_el1
+    mrs     x2, mair_el1
+    stp     x1, x2, [x0], #0x10
+
+    /* Save sctlr/tpidr. */
+    mrs     x1, sctlr_el1
+    mrs     x2, tpidr_el1
+    stp     x1, x2, [x0], #0x10
+
+    /* Save the virtual resumption entrypoint and cntv_cval_el0. */
+    adr     x1, 77f
     mrs     x2, cntv_cval_el0
     stp     x1, x2, [x0], #0x10
 
@@ -94,8 +114,8 @@ _ZN3ams4kern5board8nintendo2nx13KSleepManager15CpuSleepHandlerEmmm:
 1:  /* Suspend. */
     LOAD_IMMEDIATE_32(x0, 0xC4000001)
     LOAD_IMMEDIATE_32(x1, 0x0201001B)
-    mov     x2, x16
-    mov     x3, x17
+    mov     x2, x17
+    mov     x3, x16
     smc     #1
 0:  b       0b
 
@@ -104,6 +124,65 @@ _ZN3ams4kern5board8nintendo2nx13KSleepManager15CpuSleepHandlerEmmm:
 .global     _ZN3ams4kern5board8nintendo2nx13KSleepManager11ResumeEntryEm
 .type       _ZN3ams4kern5board8nintendo2nx13KSleepManager11ResumeEntryEm, %function
 _ZN3ams4kern5board8nintendo2nx13KSleepManager11ResumeEntryEm:
+    /* Mask interrupts. */
+    msr     daifset, #0xF
+
+    /* Save the argument. */
+    mov     x21, x0
+
+    /* Check that we're at the correct exception level. */
+    mrs     x0, currentel
+
+    /* Check if we're EL1. */
+    cmp     x0, #0x4
+    b.eq    3f
+
+    /* Check if we're EL2. */
+    cmp     x0, #0x8
+    b.eq    2f
+
+1:  /* We're running at EL3. */
+    b       1b
+
+2:  /* We're running at EL2. */
+    b       2b
+
+3:  /* We're running at EL1. */
+
+    /* Invalidate the L1 cache. */
+    mov     x0, #0
+    bl      _ZN3ams4kern5board8nintendo2nx13KSleepManager33InvalidateDataCacheForResumeEntryEm
+
+    /* Get the current core id. */
+    mrs     x0, mpidr_el1
+    and     x0, x0, #0xFF
+
+    /* If we're on core0, we want to invalidate the L2 cache. */
+    cbnz    x0, 4f
+
+    mov     x0, #1
+    bl      _ZN3ams4kern5board8nintendo2nx13KSleepManager33InvalidateDataCacheForResumeEntryEm
+
+4:  /* Invalidate the L1 cache. */
+    mov     x0, #0
+    bl      _ZN3ams4kern5board8nintendo2nx13KSleepManager33InvalidateDataCacheForResumeEntryEm
+
+    /* Invalidate the instruction cache. */
+    ic      ialluis
+    dsb     sy
+    isb
+
+    /* Invalidate the entire tlb. */
+    tlbi    vmalle1is
+    dsb     sy
+    isb
+
+    /* Switch to sp 1. */
+    msr     spsel, #1
+
+    /* Prepare to restore the saved context. */
+    mov     x0, x21
+
     /* Enable access to FPU registers. */
     mrs     x1, cpacr_el1
     orr     x1, x1, #0x100000
@@ -147,12 +226,121 @@ _ZN3ams4kern5board8nintendo2nx13KSleepManager11ResumeEntryEm:
     ldp     q28, q29, [x0], #0x20
     ldp     q30, q31, [x0], #0x20
 
-    /* Restore tpidr/cntv_cval_el0. */
+    /* Restore cpuactlr/cpuectlr. */
     ldp     x1, x2, [x0], #0x10
-    msr     tpidr_el1, x1
-    msr     cntv_cval_el0, x2
+    mrs     x3, cpuectlr_el1
+    cmp     x1, x3
+5:  b.ne    5b
+    mrs     x3, cpuactlr_el1
+    cmp     x2, x3
+6:  b.ne    6b
+
+    /* Restore ttbr0/ttbr1. */
+    ldp     x1, x2, [x0], #0x10
+    msr     ttbr0_el1, x1
+    msr     ttbr1_el1, x2
+
+    /* Restore tcr/mair. */
+    ldp     x1, x2, [x0], #0x10
+    msr     tcr_el1, x1
+    msr     mair_el1, x2
+
+    /* Get sctlr, tpidr, the entrypoint, and cntv_cval_el0. */
+    ldp     x1, x2, [x0], #0x10
+    ldp     x3, x4, [x0], #0x10
+
+    /* Set the global context back into x18/tpidr. */
+    msr     tpidr_el1, x2
+    msr     cntv_cval_el0, x4
+    dsb     sy
+    isb
+
+    /* Restore sctlr with the wxn bit cleared. */
+    bic     x2, x1, #0x80000
+    msr     sctlr_el1, x2
+    dsb     sy
+    isb
+
+    /* Jump to the entrypoint. */
+    br      x3
+
+77: /* Virtual resumption entrypoint. */
+
+    /* Restore sctlr. */
+    msr     sctlr_el1, x1
     dsb     sy
     isb
 
-    /* Return. */
+    ret
+
+/* ams::kern::board::nintendo::nx::KSleepManager::InvalidateDataCacheForResumeEntry(uintptr_t level) */
+.section    .sleep._ZN3ams4kern5board8nintendo2nx13KSleepManager33InvalidateDataCacheForResumeEntryEm, "ax", %progbits
+.global     _ZN3ams4kern5board8nintendo2nx13KSleepManager33InvalidateDataCacheForResumeEntryEm
+.type       _ZN3ams4kern5board8nintendo2nx13KSleepManager33InvalidateDataCacheForResumeEntryEm, %function
+_ZN3ams4kern5board8nintendo2nx13KSleepManager33InvalidateDataCacheForResumeEntryEm:
+    /* cpu::DataSynchronizationBarrier(); */
+    dsb     sy
+
+    /* const u64 level_sel_value = level << 1; */
+    lsl     x8, x0, #1
+
+    /* cpu::SetCsselrEl1(level_sel_value); */
+    msr     csselr_el1, x8
+
+    /* cpu::InstructionMemoryBarrier(); */
+    isb
+
+    /* CacheSizeIdAccessor ccsidr_el1; */
+    mrs     x13, ccsidr_el1
+
+    /* const int num_ways  = ccsidr_el1.GetAssociativity(); */
+    ubfx    w10, w13, #3, #0xA
+
+    /* const int line_size = ccsidr_el1.GetLineSize(); */
+    and     w11, w13, #7
+
+    /* const int num_sets  = ccsidr_el1.GetNumberOfSets(); */
+    ubfx    w13, w13, #0xD, #0xF
+
+    /* int way = 0; */
+    mov     w9, wzr
+
+    /* const u64 set_shift = static_cast<u64>(line_size + 4); */
+    add     w11, w11, #4
+
+    /* const u64 way_shift = static_cast<u64>(__builtin_clz(num_ways)); */
+    clz     w12, w10
+
+
+0:  /* do { */
+    /*     int set = 0; */
+    mov     w14, wzr
+
+    /*      const u64 way_value = (static_cast<u64>(way) << way_shift); */
+    lsl     w15, w9, w12
+
+1:  /*     do { */
+
+    /*         const u64 isw_value = (static_cast<u64>(set) << set_shift) | way_value | level_sel_value; */
+    lsl     w16, w14, w11
+    orr     w16, w16, w15
+    sxtw    x16, w16
+    orr     x16, x16, x8
+
+    /*         __asm__ __volatile__("dc isw, %0" :: "r"(isw_value) : "memory"); */
+    dc      isw, x16
+
+    /*     while (set <= num_sets); */
+    cmp     w13, w14
+    add     w14, w14, #1
+    b.ne    1b
+
+    /* while (way <= num_ways); */
+    cmp     w9, w10
+    add     w9, w9, #1
+    b.ne    0b
+
+    /* cpu::EnsureInstructionConsistency(); */
+    dsb     sy
+    isb
     ret

libraries/libmesosphere/source/board/nintendo/nx/kern_k_system_control.cpp

@@ -29,6 +29,7 @@ namespace ams::kern::board::nintendo::nx {
         constinit bool g_call_smc_on_panic;
 
         /* Global variables for secure memory. */
+        constexpr size_t SecureAppletMemorySize = 4_MB;
         constinit KSpinLock g_secure_applet_lock;
         constinit bool g_secure_applet_memory_used = false;
         constinit KVirtualAddress g_secure_applet_memory_address = Null<KVirtualAddress>;
@@ -245,8 +246,8 @@ namespace ams::kern::board::nintendo::nx {
 
         Result AllocateSecureMemoryForApplet(KVirtualAddress *out, size_t size) {
             /* Verify that the size is valid. */
-            R_UNLESS(util::IsAligned(size, PageSize),                svc::ResultInvalidSize());
-            R_UNLESS(size <= KSystemControl::SecureAppletMemorySize, svc::ResultOutOfMemory());
+            R_UNLESS(util::IsAligned(size, PageSize), svc::ResultInvalidSize());
+            R_UNLESS(size <= SecureAppletMemorySize,  svc::ResultOutOfMemory());
 
             /* Disable interrupts and acquire the secure applet lock. */
             KScopedInterruptDisable di;
@@ -272,7 +273,7 @@ namespace ams::kern::board::nintendo::nx {
 
             /* Verify that the memory being freed is correct. */
             MESOSPHERE_ABORT_UNLESS(address == g_secure_applet_memory_address);
-            MESOSPHERE_ABORT_UNLESS(size <= KSystemControl::SecureAppletMemorySize);
+            MESOSPHERE_ABORT_UNLESS(size <= SecureAppletMemorySize);
             MESOSPHERE_ABORT_UNLESS(util::IsAligned(size, PageSize));
             MESOSPHERE_ABORT_UNLESS(g_secure_applet_memory_used);
 
@@ -367,14 +368,10 @@ namespace ams::kern::board::nintendo::nx {
 
     size_t KSystemControl::Init::GetMinimumNonSecureSystemPoolSize() {
         /* Verify that our minimum is at least as large as Nintendo's. */
-        constexpr size_t MinimumSizeWithFatal = ::ams::svc::RequiredNonSecureSystemMemorySizeWithFatal;
-        static_assert(MinimumSizeWithFatal >= 0x2C04000);
+        constexpr size_t MinimumSize = ::ams::svc::RequiredNonSecureSystemMemorySize;
+        static_assert(MinimumSize >= 0x29C8000);
 
-        constexpr size_t MinimumSizeWithoutFatal = ::ams::svc::RequiredNonSecureSystemMemorySize;
-        static_assert(MinimumSizeWithoutFatal >= 0x2A00000);
-
-        /* Include fatal in non-seure size on 16.0.0+. */
-        return kern::GetTargetFirmware() >= ams::TargetFirmware_16_0_0 ? MinimumSizeWithFatal : MinimumSizeWithoutFatal;
+        return MinimumSize;
     }
 
     u8 KSystemControl::Init::GetDebugLogUartPort() {
@@ -386,7 +383,7 @@ namespace ams::kern::board::nintendo::nx {
         return static_cast<u8>((value >> 32) & 0xFF);
     }
 
-    void KSystemControl::Init::CpuOnImpl(u64 core_id, uintptr_t entrypoint, uintptr_t arg) {
+    void KSystemControl::Init::CpuOn(u64 core_id, uintptr_t entrypoint, uintptr_t arg) {
         MESOSPHERE_INIT_ABORT_UNLESS((::ams::kern::arch::arm64::smc::CpuOn<smc::SmcId_Supervisor, false>(core_id, entrypoint, arg)) == 0);
     }
 
@@ -402,41 +399,40 @@ namespace ams::kern::board::nintendo::nx {
 
     /* System Initialization. */
     void KSystemControl::InitializePhase1() {
-        /* Configure KTargetSystem. */
-        {
-            /* Set IsDebugMode. */
-            {
-                KTargetSystem::SetIsDebugMode(GetConfigBool(smc::ConfigItem::IsDebugMode));
-
-                /* If debug mode, we want to initialize uart logging. */
-                KTargetSystem::EnableDebugLogging(KTargetSystem::IsDebugMode());
-            }
-
-            /* Set Kernel Configuration. */
-            {
-                const auto kernel_config = util::BitPack32{GetConfigU32(smc::ConfigItem::KernelConfiguration)};
-
-                KTargetSystem::EnableDebugMemoryFill(kernel_config.Get<smc::KernelConfiguration::DebugFillMemory>());
-                KTargetSystem::EnableUserExceptionHandlers(kernel_config.Get<smc::KernelConfiguration::EnableUserExceptionHandlers>());
-                KTargetSystem::EnableDynamicResourceLimits(!kernel_config.Get<smc::KernelConfiguration::DisableDynamicResourceLimits>());
-                KTargetSystem::EnableUserPmuAccess(kernel_config.Get<smc::KernelConfiguration::EnableUserPmuAccess>());
-
-                g_call_smc_on_panic = kernel_config.Get<smc::KernelConfiguration::UseSecureMonitorPanicCall>();
-            }
-
-            /* Set Kernel Debugging. */
-            {
-                /* NOTE: This is used to restrict access to SvcKernelDebug/SvcChangeKernelTraceState. */
-                /* Mesosphere may wish to not require this, as we'd ideally keep ProgramVerification enabled for userland. */
-                KTargetSystem::EnableKernelDebugging(GetConfigBool(smc::ConfigItem::DisableProgramVerification));
-            }
-        }
-
-        /* Initialize random and resource limit. */
+        /* Initialize our random generator. */
         {
             u64 seed;
             smc::GenerateRandomBytes(std::addressof(seed), sizeof(seed));
-            KSystemControlBase::InitializePhase1Base(seed);
+            s_random_generator.Initialize(reinterpret_cast<const u32*>(std::addressof(seed)), sizeof(seed) / sizeof(u32));
+            s_initialized_random_generator = true;
+        }
+
+        /* Set IsDebugMode. */
+        {
+            KTargetSystem::SetIsDebugMode(GetConfigBool(smc::ConfigItem::IsDebugMode));
+
+            /* If debug mode, we want to initialize uart logging. */
+            KTargetSystem::EnableDebugLogging(KTargetSystem::IsDebugMode());
+            KDebugLog::Initialize();
+        }
+
+        /* Set Kernel Configuration. */
+        {
+            const auto kernel_config = util::BitPack32{GetConfigU32(smc::ConfigItem::KernelConfiguration)};
+
+            KTargetSystem::EnableDebugMemoryFill(kernel_config.Get<smc::KernelConfiguration::DebugFillMemory>());
+            KTargetSystem::EnableUserExceptionHandlers(kernel_config.Get<smc::KernelConfiguration::EnableUserExceptionHandlers>());
+            KTargetSystem::EnableDynamicResourceLimits(!kernel_config.Get<smc::KernelConfiguration::DisableDynamicResourceLimits>());
+            KTargetSystem::EnableUserPmuAccess(kernel_config.Get<smc::KernelConfiguration::EnableUserPmuAccess>());
+
+            g_call_smc_on_panic = kernel_config.Get<smc::KernelConfiguration::UseSecureMonitorPanicCall>();
+        }
+
+        /* Set Kernel Debugging. */
+        {
+            /* NOTE: This is used to restrict access to SvcKernelDebug/SvcChangeKernelTraceState. */
+            /* Mesosphere may wish to not require this, as we'd ideally keep ProgramVerification enabled for userland. */
+            KTargetSystem::EnableKernelDebugging(GetConfigBool(smc::ConfigItem::DisableProgramVerification));
         }
 
         /* Configure the Kernel Carveout region. */
@@ -446,17 +442,26 @@ namespace ams::kern::board::nintendo::nx {
 
             smc::ConfigureCarveout(0, carveout.GetAddress(), carveout.GetSize());
         }
+
+        /* Initialize the system resource limit (and potentially other things). */
+        KSystemControlBase::InitializePhase1(true);
     }
 
     void KSystemControl::InitializePhase2() {
         /* Initialize the sleep manager. */
         KSleepManager::Initialize();
 
-        /* Get the secure applet memory. */
-        const auto &secure_applet_memory = KMemoryLayout::GetSecureAppletMemoryRegion();
-        MESOSPHERE_INIT_ABORT_UNLESS(secure_applet_memory.GetSize() == SecureAppletMemorySize);
+        /* Reserve secure applet memory. */
+        if (GetTargetFirmware() >= TargetFirmware_5_0_0) {
+            MESOSPHERE_ABORT_UNLESS(g_secure_applet_memory_address == Null<KVirtualAddress>);
+            MESOSPHERE_ABORT_UNLESS(Kernel::GetSystemResourceLimit().Reserve(ams::svc::LimitableResource_PhysicalMemoryMax, SecureAppletMemorySize));
 
-        g_secure_applet_memory_address = secure_applet_memory.GetAddress();
+            constexpr auto SecureAppletAllocateOption = KMemoryManager::EncodeOption(KMemoryManager::Pool_System, KMemoryManager::Direction_FromFront);
+            const KPhysicalAddress secure_applet_memory_phys_addr = Kernel::GetMemoryManager().AllocateAndOpenContinuous(SecureAppletMemorySize / PageSize, 1, SecureAppletAllocateOption);
+            MESOSPHERE_ABORT_UNLESS(secure_applet_memory_phys_addr != Null<KPhysicalAddress>);
+
+            g_secure_applet_memory_address = KMemoryLayout::GetLinearVirtualAddress(secure_applet_memory_phys_addr);
+        }
 
         /* Initialize KTrace (and potentially other init). */
         KSystemControlBase::InitializePhase2();

libraries/libmesosphere/source/board/nintendo/nx/kern_lps_driver.cpp

@@ -395,7 +395,7 @@ namespace ams::kern::board::nintendo::nx::lps {
         R_SUCCEED();
     }
 
-    void InvokeCpuSleepHandler(uintptr_t arg, uintptr_t entry, uintptr_t entry_arg) {
+    void InvokeCpuSleepHandler(uintptr_t arg, uintptr_t entry) {
         /* Verify that we're allowed to perform suspension. */
         MESOSPHERE_ABORT_UNLESS(g_lps_init_done);
         MESOSPHERE_ABORT_UNLESS(GetCurrentCoreId() == 0);
@@ -416,7 +416,7 @@ namespace ams::kern::board::nintendo::nx::lps {
         Read(g_pmc_address + APBDEV_PMC_SCRATCH0);
 
         /* Invoke the sleep hander. */
-        KSleepManager::CpuSleepHandler(arg, entry, entry_arg);
+        KSleepManager::CpuSleepHandler(arg, entry);
 
         /* Disable deep power down. */
         Write(g_pmc_address + APBDEV_PMC_DPD_ENABLE, 0);

libraries/libmesosphere/source/board/nintendo/nx/kern_lps_driver.hpp

@@ -22,7 +22,7 @@ namespace ams::kern::board::nintendo::nx {
 
         void Initialize();
         Result EnableSuspend(bool enable);
-        void InvokeCpuSleepHandler(uintptr_t arg, uintptr_t entry, uintptr_t entry_arg);
+        void InvokeCpuSleepHandler(uintptr_t arg, uintptr_t entry);
         void ResumeBpmpFirmware();
 
     }

libraries/libmesosphere/source/init/kern_init_slab_setup.cpp

@@ -17,36 +17,30 @@
 
 namespace ams::kern::init {
 
-    /* For macro convenience. */
-    using KSessionRequestMappings = KSessionRequest::SessionMappings::DynamicMappings;
-    using KThreadLockInfo         = KThread::LockWithPriorityInheritanceInfo;
-
     #define SLAB_COUNT(CLASS) g_slab_resource_counts.num_##CLASS
 
     #define FOREACH_SLAB_TYPE(HANDLER, ...)                                                                                     \
-        HANDLER(KProcess,                (SLAB_COUNT(KProcess)),                                                    ## __VA_ARGS__) \
-        HANDLER(KThread,                 (SLAB_COUNT(KThread)),                                                     ## __VA_ARGS__) \
-        HANDLER(KEvent,                  (SLAB_COUNT(KEvent)),                                                      ## __VA_ARGS__) \
-        HANDLER(KInterruptEvent,         (SLAB_COUNT(KInterruptEvent)),                                             ## __VA_ARGS__) \
-        HANDLER(KPort,                   (SLAB_COUNT(KPort)),                                                       ## __VA_ARGS__) \
-        HANDLER(KSharedMemory,           (SLAB_COUNT(KSharedMemory)),                                               ## __VA_ARGS__) \
-        HANDLER(KSharedMemoryInfo,       (SLAB_COUNT(KSharedMemory) * 8),                                           ## __VA_ARGS__) \
-        HANDLER(KTransferMemory,         (SLAB_COUNT(KTransferMemory)),                                             ## __VA_ARGS__) \
-        HANDLER(KCodeMemory,             (SLAB_COUNT(KCodeMemory)),                                                 ## __VA_ARGS__) \
-        HANDLER(KDeviceAddressSpace,     (SLAB_COUNT(KDeviceAddressSpace)),                                         ## __VA_ARGS__) \
-        HANDLER(KSession,                (SLAB_COUNT(KSession)),                                                    ## __VA_ARGS__) \
-        HANDLER(KSessionRequest,         (SLAB_COUNT(KSession) * 2),                                                ## __VA_ARGS__) \
-        HANDLER(KLightSession,           (SLAB_COUNT(KLightSession)),                                               ## __VA_ARGS__) \
-        HANDLER(KThreadLocalPage,        (SLAB_COUNT(KProcess) + (SLAB_COUNT(KProcess) + SLAB_COUNT(KThread)) / 8), ## __VA_ARGS__) \
-        HANDLER(KObjectName,             (SLAB_COUNT(KObjectName)),                                                 ## __VA_ARGS__) \
-        HANDLER(KResourceLimit,          (SLAB_COUNT(KResourceLimit)),                                              ## __VA_ARGS__) \
-        HANDLER(KEventInfo,              (SLAB_COUNT(KThread) + SLAB_COUNT(KDebug)),                                ## __VA_ARGS__) \
-        HANDLER(KDebug,                  (SLAB_COUNT(KDebug)),                                                      ## __VA_ARGS__) \
-        HANDLER(KIoPool,                 (SLAB_COUNT(KIoPool)),                                                     ## __VA_ARGS__) \
-        HANDLER(KIoRegion,               (SLAB_COUNT(KIoRegion)),                                                   ## __VA_ARGS__) \
-        HANDLER(KSessionRequestMappings, (SLAB_COUNT(KSessionRequestMappings)),                                     ## __VA_ARGS__) \
-        HANDLER(KSecureSystemResource,   (SLAB_COUNT(KProcess)),                                                    ## __VA_ARGS__) \
-        HANDLER(KThreadLockInfo,         (SLAB_COUNT(KThread)),                                                     ## __VA_ARGS__)
+        HANDLER(KProcess,            (SLAB_COUNT(KProcess)),                                                    ## __VA_ARGS__) \
+        HANDLER(KThread,             (SLAB_COUNT(KThread)),                                                     ## __VA_ARGS__) \
+        HANDLER(KEvent,              (SLAB_COUNT(KEvent)),                                                      ## __VA_ARGS__) \
+        HANDLER(KInterruptEvent,     (SLAB_COUNT(KInterruptEvent)),                                             ## __VA_ARGS__) \
+        HANDLER(KInterruptEventTask, (SLAB_COUNT(KInterruptEvent)),                                             ## __VA_ARGS__) \
+        HANDLER(KPort,               (SLAB_COUNT(KPort)),                                                       ## __VA_ARGS__) \
+        HANDLER(KSharedMemory,       (SLAB_COUNT(KSharedMemory)),                                               ## __VA_ARGS__) \
+        HANDLER(KSharedMemoryInfo,   (SLAB_COUNT(KSharedMemory) * 8),                                           ## __VA_ARGS__) \
+        HANDLER(KTransferMemory,     (SLAB_COUNT(KTransferMemory)),                                             ## __VA_ARGS__) \
+        HANDLER(KCodeMemory,         (SLAB_COUNT(KCodeMemory)),                                                 ## __VA_ARGS__) \
+        HANDLER(KDeviceAddressSpace, (SLAB_COUNT(KDeviceAddressSpace)),                                         ## __VA_ARGS__) \
+        HANDLER(KSession,            (SLAB_COUNT(KSession)),                                                    ## __VA_ARGS__) \
+        HANDLER(KSessionRequest,     (SLAB_COUNT(KSession) * 2),                                                ## __VA_ARGS__) \
+        HANDLER(KLightSession,       (SLAB_COUNT(KLightSession)),                                               ## __VA_ARGS__) \
+        HANDLER(KThreadLocalPage,    (SLAB_COUNT(KProcess) + (SLAB_COUNT(KProcess) + SLAB_COUNT(KThread)) / 8), ## __VA_ARGS__) \
+        HANDLER(KObjectName,         (SLAB_COUNT(KObjectName)),                                                 ## __VA_ARGS__) \
+        HANDLER(KResourceLimit,      (SLAB_COUNT(KResourceLimit)),                                              ## __VA_ARGS__) \
+        HANDLER(KEventInfo,          (SLAB_COUNT(KThread) + SLAB_COUNT(KDebug)),                                ## __VA_ARGS__) \
+        HANDLER(KDebug,              (SLAB_COUNT(KDebug)),                                                      ## __VA_ARGS__) \
+        HANDLER(KIoPool,             (SLAB_COUNT(KIoPool)),                                                     ## __VA_ARGS__) \
+        HANDLER(KIoRegion,           (SLAB_COUNT(KIoRegion)),                                                   ## __VA_ARGS__)
 
     namespace {
 
@@ -61,55 +55,50 @@ namespace ams::kern::init {
         #undef DEFINE_SLAB_TYPE_ENUM_MEMBER
 
         /* Constexpr counts. */
-        constexpr size_t SlabCountKProcess                = 80;
-        constexpr size_t SlabCountKThread                 = 800;
-        constexpr size_t SlabCountKEvent                  = 900;
-        constexpr size_t SlabCountKInterruptEvent         = 100;
-        constexpr size_t SlabCountKPort                   = 384;
-        constexpr size_t SlabCountKSharedMemory           = 80;
-        constexpr size_t SlabCountKTransferMemory         = 200;
-        constexpr size_t SlabCountKCodeMemory             = 10;
-        constexpr size_t SlabCountKDeviceAddressSpace     = 300;
-        constexpr size_t SlabCountKSession                = 1133;
-        constexpr size_t SlabCountKLightSession           = 100;
-        constexpr size_t SlabCountKObjectName             = 7;
-        constexpr size_t SlabCountKResourceLimit          = 5;
-        constexpr size_t SlabCountKDebug                  = cpu::NumCores;
-        constexpr size_t SlabCountKIoPool                 = 1;
-        constexpr size_t SlabCountKIoRegion               = 6;
-        constexpr size_t SlabcountKSessionRequestMappings = 40;
+        constexpr size_t SlabCountKProcess              = 80;
+        constexpr size_t SlabCountKThread               = 800;
+        constexpr size_t SlabCountKEvent                = 900;
+        constexpr size_t SlabCountKInterruptEvent       = 100;
+        constexpr size_t SlabCountKPort                 = 384;
+        constexpr size_t SlabCountKSharedMemory         = 80;
+        constexpr size_t SlabCountKTransferMemory       = 200;
+        constexpr size_t SlabCountKCodeMemory           = 10;
+        constexpr size_t SlabCountKDeviceAddressSpace   = 300;
+        constexpr size_t SlabCountKSession              = 1133;
+        constexpr size_t SlabCountKLightSession         = 100;
+        constexpr size_t SlabCountKObjectName           = 7;
+        constexpr size_t SlabCountKResourceLimit        = 5;
+        constexpr size_t SlabCountKDebug                = cpu::NumCores;
+        constexpr size_t SlabCountKIoPool               = 1;
+        constexpr size_t SlabCountKIoRegion             = 6;
 
-        constexpr size_t SlabCountExtraKThread            = (1024 + 256 + 256) - SlabCountKThread;
+        constexpr size_t SlabCountExtraKThread          = (1024 + 256 + 256) - SlabCountKThread;
 
         namespace test {
 
             constexpr size_t RequiredSizeForExtraThreadCount = SlabCountExtraKThread * (sizeof(KThread) + (sizeof(KThreadLocalPage) / 8) + sizeof(KEventInfo));
             static_assert(RequiredSizeForExtraThreadCount <= KernelSlabHeapAdditionalSize);
 
-            static_assert(KernelPageBufferHeapSize == 2 * PageSize + (SlabCountKProcess + SlabCountKThread + (SlabCountKProcess + SlabCountKThread) / 8) * PageSize);
-            static_assert(KernelPageBufferAdditionalSize == (SlabCountExtraKThread + (SlabCountExtraKThread / 8)) * PageSize);
-
         }
 
         /* Global to hold our resource counts. */
         constinit KSlabResourceCounts g_slab_resource_counts = {
-            .num_KProcess                = SlabCountKProcess,
-            .num_KThread                 = SlabCountKThread,
-            .num_KEvent                  = SlabCountKEvent,
-            .num_KInterruptEvent         = SlabCountKInterruptEvent,
-            .num_KPort                   = SlabCountKPort,
-            .num_KSharedMemory           = SlabCountKSharedMemory,
-            .num_KTransferMemory         = SlabCountKTransferMemory,
-            .num_KCodeMemory             = SlabCountKCodeMemory,
-            .num_KDeviceAddressSpace     = SlabCountKDeviceAddressSpace,
-            .num_KSession                = SlabCountKSession,
-            .num_KLightSession           = SlabCountKLightSession,
-            .num_KObjectName             = SlabCountKObjectName,
-            .num_KResourceLimit          = SlabCountKResourceLimit,
-            .num_KDebug                  = SlabCountKDebug,
-            .num_KIoPool                 = SlabCountKIoPool,
-            .num_KIoRegion               = SlabCountKIoRegion,
-            .num_KSessionRequestMappings = SlabcountKSessionRequestMappings,
+            .num_KProcess               = SlabCountKProcess,
+            .num_KThread                = SlabCountKThread,
+            .num_KEvent                 = SlabCountKEvent,
+            .num_KInterruptEvent        = SlabCountKInterruptEvent,
+            .num_KPort                  = SlabCountKPort,
+            .num_KSharedMemory          = SlabCountKSharedMemory,
+            .num_KTransferMemory        = SlabCountKTransferMemory,
+            .num_KCodeMemory            = SlabCountKCodeMemory,
+            .num_KDeviceAddressSpace    = SlabCountKDeviceAddressSpace,
+            .num_KSession               = SlabCountKSession,
+            .num_KLightSession          = SlabCountKLightSession,
+            .num_KObjectName            = SlabCountKObjectName,
+            .num_KResourceLimit         = SlabCountKResourceLimit,
+            .num_KDebug                 = SlabCountKDebug,
+            .num_KIoPool                = SlabCountKIoPool,
+            .num_KIoRegion              = SlabCountKIoRegion,
         };
 
         template<typename T>
@@ -142,7 +131,7 @@ namespace ams::kern::init {
     }
 
     size_t CalculateSlabHeapGapSize() {
-        constexpr size_t KernelSlabHeapGapSize = 2_MB - 356_KB;
+        constexpr size_t KernelSlabHeapGapSize = 2_MB - 296_KB;
         static_assert(KernelSlabHeapGapSize <= KernelSlabHeapGapsSizeMax);
         return KernelSlabHeapGapSize;
     }
@@ -166,6 +155,23 @@ namespace ams::kern::init {
         return size;
     }
 
+    void InitializeKPageBufferSlabHeap() {
+        const auto &counts = GetSlabResourceCounts();
+        const size_t num_pages = counts.num_KProcess + counts.num_KThread + (counts.num_KProcess + counts.num_KThread) / 8;
+        const size_t slab_size = num_pages * PageSize;
+
+        /* Reserve memory from the system resource limit. */
+        MESOSPHERE_ABORT_UNLESS(Kernel::GetSystemResourceLimit().Reserve(ams::svc::LimitableResource_PhysicalMemoryMax, slab_size));
+
+        /* Allocate memory for the slab. */
+        constexpr auto AllocateOption = KMemoryManager::EncodeOption(KMemoryManager::Pool_System, KMemoryManager::Direction_FromFront);
+        const KPhysicalAddress slab_address = Kernel::GetMemoryManager().AllocateAndOpenContinuous(num_pages, 1, AllocateOption);
+        MESOSPHERE_ABORT_UNLESS(slab_address != Null<KPhysicalAddress>);
+
+        /* Initialize the slabheap. */
+        KPageBuffer::InitializeSlabHeap(GetVoidPointer(KMemoryLayout::GetLinearVirtualAddress(slab_address)), slab_size);
+    }
+
     void InitializeSlabHeaps() {
         /* Get the slab region, since that's where we'll be working. */
         const KMemoryRegion &slab_region = KMemoryLayout::GetSlabRegion();
@@ -234,34 +240,4 @@ namespace ams::kern::init {
         FreeUnusedSlabMemory(gap_start, gap_size + (slab_region.GetEndAddress() - GetInteger(address)));
     }
 
-}
-
-namespace ams::kern {
-
-    void KPageBufferSlabHeap::Initialize(KDynamicPageManager &allocator) {
-        /* Get slab resource counts. */
-        const auto &counts = init::GetSlabResourceCounts();
-
-        /* If size is correct, account for thread local pages. */
-        if (BufferSize == PageSize) {
-            s_buffer_count += counts.num_KProcess + counts.num_KThread + (counts.num_KProcess + counts.num_KThread) / 8;
-        }
-
-        /* Set our object size. */
-        m_obj_size = BufferSize;
-
-        /* Initialize the base allocator. */
-        KSlabHeapImpl::Initialize();
-
-        /* Allocate the desired page count. */
-        for (size_t i = 0; i < s_buffer_count; ++i) {
-            /* Allocate an appropriate buffer. */
-            auto * const pb = (BufferSize <= PageSize) ? allocator.Allocate() : allocator.Allocate(BufferSize / PageSize);
-            MESOSPHERE_ABORT_UNLESS(pb != nullptr);
-
-            /* Free to our slab. */
-            KSlabHeapImpl::Free(pb);
-        }
-    }
-
-}
+}

libraries/libmesosphere/source/kern_initial_process.cpp

@@ -128,13 +128,13 @@ namespace ams::kern {
                 KProcess *new_process = nullptr;
                 {
                     /* Make page groups to represent the data. */
-                    KPageGroup pg(Kernel::GetSystemSystemResource().GetBlockInfoManagerPointer());
-                    KPageGroup workaround_pg(Kernel::GetSystemSystemResource().GetBlockInfoManagerPointer());
+                    KPageGroup pg(std::addressof(Kernel::GetSystemBlockInfoManager()));
+                    KPageGroup workaround_pg(std::addressof(Kernel::GetSystemBlockInfoManager()));
 
                     /* Populate the page group to represent the data. */
                     {
                         /* Allocate the previously unreserved pages. */
-                        KPageGroup unreserve_pg(Kernel::GetSystemSystemResource().GetBlockInfoManagerPointer());
+                        KPageGroup unreserve_pg(std::addressof(Kernel::GetSystemBlockInfoManager()));
                         MESOSPHERE_R_ABORT_UNLESS(Kernel::GetMemoryManager().AllocateAndOpen(std::addressof(unreserve_pg), unreserved_size / PageSize, KMemoryManager::EncodeOption(dst_pool, KMemoryManager::Direction_FromFront)));
 
                         /* Add the previously reserved pages. */

libraries/libmesosphere/source/kern_k_address_arbiter.cpp

@@ -24,9 +24,7 @@ namespace ams::kern {
         }
 
         ALWAYS_INLINE bool DecrementIfLessThan(s32 *out, KProcessAddress address, s32 value) {
-            /* NOTE: If scheduler lock is not held here, interrupt disable is required. */
-            /* KScopedInterruptDisable di; */
-            MESOSPHERE_ASSERT(KScheduler::IsSchedulerLockedByCurrentThread());
+            KScopedInterruptDisable di;
 
             if (!cpu::CanAccessAtomic(address)) {
                 return false;
@@ -36,9 +34,7 @@ namespace ams::kern {
         }
 
         ALWAYS_INLINE bool UpdateIfEqual(s32 *out, KProcessAddress address, s32 value, s32 new_value) {
-            /* NOTE: If scheduler lock is not held here, interrupt disable is required. */
-            /* KScopedInterruptDisable di; */
-            MESOSPHERE_ASSERT(KScheduler::IsSchedulerLockedByCurrentThread());
+            KScopedInterruptDisable di;
 
             if (!cpu::CanAccessAtomic(address)) {
                 return false;
@@ -127,7 +123,7 @@ namespace ams::kern {
             s32 new_value;
             if (count <= 0) {
                 if ((it != m_tree.end()) && (it->GetAddressArbiterKey() == addr)) {
-                    new_value = value - 1;
+                    new_value = value - 2;
                 } else {
                     new_value = value + 1;
                 }
@@ -136,7 +132,7 @@ namespace ams::kern {
                     auto tmp_it = it;
                     s32 tmp_num_waiters = 0;
                     while ((++tmp_it != m_tree.end()) && (tmp_it->GetAddressArbiterKey() == addr)) {
-                        if ((++tmp_num_waiters) >= count) {
+                        if ((tmp_num_waiters++) >= count) {
                             break;
                         }
                     }