daybreak: update for hid refactor (#1222 )

reboot_to_payload: Update for new libnx HID interface
strat/cfg: Update for new libnx HID interface
2020-12-02 02:21:05 -08:00 · 2020-12-02 00:51:02 +01:00 · 2020-12-02 00:50:14 +01:00 · 2020-12-02 00:42:13 +01:00 · 2020-12-01 15:19:29 -08:00 · 2020-12-01 14:58:35 -08:00
252 changed files with 3503 additions and 5390 deletions
--- a/7
+++ b/7
@@ -141,16 +141,15 @@ dist: dist-no-debug
 	cp stratosphere/creport/creport.elf atmosphere-$(AMSVER)-debug/creport.elf
 	cp stratosphere/dmnt/dmnt.elf atmosphere-$(AMSVER)-debug/dmnt.elf
 	cp stratosphere/eclct.stub/eclct.stub.elf atmosphere-$(AMSVER)-debug/eclct.stub.elf
-	cp stratosphere/erpt/erpt.elf atmosphere-$(AMSVER)-debug/erpt.elf
 	cp stratosphere/fatal/fatal.elf atmosphere-$(AMSVER)-debug/fatal.elf
-	cp stratosphere/jpegdec/jpegdec.elf atmosphere-$(AMSVER)-debug/jpegdec.elf
 	cp stratosphere/loader/loader.elf atmosphere-$(AMSVER)-debug/loader.elf
-	cp stratosphere/ncm/ncm.elf atmosphere-$(AMSVER)-debug/ncm.elf
-	cp stratosphere/pgl/pgl.elf atmosphere-$(AMSVER)-debug/pgl.elf
 	cp stratosphere/pm/pm.elf atmosphere-$(AMSVER)-debug/pm.elf
 	cp stratosphere/ro/ro.elf atmosphere-$(AMSVER)-debug/ro.elf
 	cp stratosphere/sm/sm.elf atmosphere-$(AMSVER)-debug/sm.elf
 	cp stratosphere/spl/spl.elf atmosphere-$(AMSVER)-debug/spl.elf
+	cp stratosphere/erpt/erpt.elf atmosphere-$(AMSVER)-debug/erpt.elf
+	cp stratosphere/jpegdec/jpegdec.elf atmosphere-$(AMSVER)-debug/jpegdec.elf
+	cp stratosphere/pgl/pgl.elf atmosphere-$(AMSVER)-debug/pgl.elf
 	cp troposphere/daybreak/daybreak.elf atmosphere-$(AMSVER)-debug/daybreak.elf
 	cd atmosphere-$(AMSVER)-debug; zip -r ../atmosphere-$(AMSVER)-debug.zip ./*; cd ../;
 	rm -r atmosphere-$(AMSVER)-debug
--- a/config_templates/exosphere.ini
+++ b/config_templates/exosphere.ini
@@ -35,17 +35,6 @@
 #    mmc space, encrypted to prevent detection. This backup can be used
 #    to prevent unrecoverable edits in emergencies.

-# Key: log_port, default: 0.
-#  Desc: Controls what uart port exosphere will set up for logging.
-#  NOTE: 0 = UART-A, 1 = UART-B, 2 = UART-C, 3 = UART-D
-
-# Key: log_baud_rate, default: 115200
-#  Desc: Controls the baud rate exosphere will set up for logging.
-#  NOTE: 0 is treated as equivalent to 115200.
-
-# Key: log_inverted, default: 0.
-#  Desc: Controls whether the logging uart port is inverted.
-
 [exosphere]
 debugmode=1
 debugmode_user=0
@@ -54,6 +43,3 @@ enable_user_pmu_access=0
 blank_prodinfo_sysmmc=0
 blank_prodinfo_emummc=0
 allow_writing_to_cal_sysmmc=0
-log_port=0
-log_baud_rate=115200
-log_inverted=0
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,50 +1,4 @@
 # Changelog
-## 0.16.1
-+ Support was added for 11.0.1.
-  + `mesosphère` was updated to reflect the latest official kernel behavior.
-    + A new svc::InfoType added in 11.0.0 was implemented (it wasn't discovered before 0.16.0 released).
-    + The new Control Flow Integrity (CFI) logic added in 11.0.0 kernel was implemented.
-+ `fs` logic was refactored and cleaned up to reflect some newer sysmodule behavioral and structural changes.
-+ `exosphère` was updated to allow dynamic control of what uart port is used for logging.
-  + This can be controlled by editing the `log_port`, `log_baud_rate`, and `log_inverted` fields in `exosphere.ini`.
-+ `mesosphère` was updated to improve debugging capabilities ().
-  + This is still a work in progress, but developers may be interested.
-+ A bug was fixed that caused `fatal` to fatal error if the fatal process was already being debugged.
-+ Several issues were fixed, and usability and stability were improved.
-## 0.16.0
-+ Support was added for 11.0.0.
-  + `exosphère` was updated to reflect the latest official secure monitor behavior.
-  + `mesosphère` was updated to reflect the latest official kernel behavior.
-  + `loader`, `sm`, `boot`, `pgl` were updated to reflect the latest official behaviors.
-    + **Please Note**: 11.0.0 implements an opt-in version of the atmosphère `sm` extension that allows for closing session without unregistering services.
-      + Correspondingly, the extension will be deprecated in favor of the new official opt-in command. In 0.17.0, it will be removed entirely.
-      + If your custom system module relies on this extension (however unlikely that seems to me), please update it accordingly.
-  + `erpt` was partially updated to provide compatibility with 11.0.0.
-    + The latest firmware attaches additional fields and context information to logs.
-    + A future atmosphère update will implement this logic, so that users who are interested can also get the new information when examining their logs.
-  + **Please Note**: 11.0.0 introduced breaking changes to the `usb` system module's `usb:ds` API.
-    + Homebrew which uses the `usb:ds` service should rebuild with the latest libnx version to support running on 11.0.0.
-+ The `boot` system module was rewritten to reflect the huge driver changes introduced in 8.0.0.
-  + This includes a number of improvements to both logo display and battery management logic.
-+ Support was added for configuring the address space width for `hbl`.
-  + The `hbl_config!override_address_space_(#)` and `hbl_config!override_any_app_address_space` can now be set to `39_bit`, `36_bit`, or `32_bit` to control the address space for hbl on a per-override basis.
-  + If a configuration has not been set, hbl will now default to 39-bit address space.
-    + Previously, a legacy 36-bit address space was always used to maintain compatibility with 1.0.0.
-    + A new loader extension was added to support 39-bit whenever possible (including mesosphere-on-1.0.0), with fallback to 36-bit when unavailable.
-+ Support was added to a number of components for running on Mariko hardware.
-  + The `boot` system module can now safely be run on mariko hardware, performing correct hardware initialization.
-  + Daybreak (and generally, system update logic) were updated to be usable on Mariko.
-  + Boot0 protection/management logic was updated to perform correct actions on Mariko.
-  + Reboot to payload does not and cannot work on Mariko. Correspondingly, A "fatal error" handler was written, to display and save fatal errors from within TrustZone.
-  + **Please Note:** Atmosphere is still not properly usable on Mariko hardware.
-    + In particular, wake-from-sleep will not properly function (the magic numbers aren't set correctly), among a few other minor issues.
-+ `exosphère` received support for building under debug configuration.
-  + A small (otherwise unused) portion of IRAM is now reserved for debug-only exosphere code (this region is unused/untouched under release config).
-  + This enables logging (including printf) to uart from the secure monitor, for those interested.
-+ A number of bugs were fixed, including:
-  + Minor issues in a number of filesystem related code were fixed.
-  + An issue was fixed that could cause NCM to abort on consoles which came with 3.0.x and were never updated.
-+ Several issues were fixed, and usability and stability were improved.
 ## 0.15.0
 + fusee-primary's panic display was updated to automatically identify and give suggestions to resolve many of the most common errors users encounter.
 + Having been tested as well as I can alone, `mesosphere` (atmosphère's reimplementation of the Nintendo Switch kernel) is now available for users interested in trying it.
--- a/emummc/.gitrepo
+++ b/emummc/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/m4xw/emuMMC
 	branch = develop
-	commit = 5eed18eb527bbaa63aee5323c26de5b0cca6d28e
-	parent = 021b29d2dbc8ed0469bc822393e58c9f0d174d57
+	commit = 25075973d31a5be6f2e769f1ea0fff44daf0cdfa
+	parent = 8ba513fefbcfd8278a433090e59017963ba9887f
 	method = rebase
 	cmdver = 0.4.1
--- a/emummc/README.md
+++ b/emummc/README.md
@@ -2,7 +2,7 @@
 *A SDMMC driver replacement for Nintendo's Filesystem Services, by **m4xw***  

 ### Supported Horizon Versions
-**1.0.0 - 11.0.0**
+**1.0.0 - 10.0.0**

 ## Features
 * Arbitrary SDMMC backend selection  
--- a/emummc/source/FS/FS_offsets.c
+++ b/emummc/source/FS/FS_offsets.c
@@ -71,7 +71,6 @@ static const fs_offsets_t GET_OFFSET_STRUCT_NAME(vers) = { \
    .nand_mutex                      = FS_OFFSET##vers##_NAND_MUTEX, \
    .active_partition                = FS_OFFSET##vers##_ACTIVE_PARTITION, \
    .sdmmc_das_handle                = FS_OFFSET##vers##_SDMMC_DAS_HANDLE, \
-    .sdmmc_accessor_controller_open  = FS_OFFSET##vers##_SDMMC_WRAPPER_CONTROLLER_OPEN, \
    .sdmmc_accessor_controller_close = FS_OFFSET##vers##_SDMMC_WRAPPER_CONTROLLER_CLOSE, \
    .sd_das_init                     = FS_OFFSET##vers##_SD_DAS_INIT, \
    .nintendo_paths                  = FS_OFFSET##vers##_NINTENDO_PATHS, \
--- a/emummc/source/FS/FS_offsets.h
+++ b/emummc/source/FS/FS_offsets.h
@@ -41,7 +41,6 @@ typedef struct {
    // Misc funcs
    uintptr_t lock_mutex;
    uintptr_t unlock_mutex;
-    uintptr_t sdmmc_accessor_controller_open;
    uintptr_t sdmmc_accessor_controller_close;
    // Misc data
    uintptr_t sd_mutex;
--- a/emummc/source/FS/FS_structs.h
+++ b/emummc/source/FS/FS_structs.h
@@ -35,7 +35,7 @@ typedef struct sdmmc_accessor_vt
    void *dtor;
    void *map_device_addr_space;
    void *unmap_device_addr_space;
-    uint64_t (*sdmmc_accessor_controller_open)(void *);
+    void *controller_open;
    uint64_t (*sdmmc_accessor_controller_close)(void *);
    uint64_t (*read_write)(void *, uint64_t, uint64_t, void *, uint64_t, uint64_t);
    // More not included because we don't use it.
--- a/emummc/source/FS/offsets/100.h
+++ b/emummc/source/FS/offsets/100.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_100_LOCK_MUTEX          0x2884
 #define FS_OFFSET_100_UNLOCK_MUTEX        0x28F0

-#define FS_OFFSET_100_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_100_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x6A8AC

 // Misc Data
--- a/emummc/source/FS/offsets/1000.h
+++ b/emummc/source/FS/offsets/1000.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_1000_LOCK_MUTEX          0x28910
 #define FS_OFFSET_1000_UNLOCK_MUTEX        0x28960

-#define FS_OFFSET_1000_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_1000_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1422E0

 // Misc Data
--- a/emummc/source/FS/offsets/1000_exfat.h
+++ b/emummc/source/FS/offsets/1000_exfat.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_1000_EXFAT_LOCK_MUTEX          0x28910
 #define FS_OFFSET_1000_EXFAT_UNLOCK_MUTEX        0x28960

-#define FS_OFFSET_1000_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_1000_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1422E0

 // Misc Data
--- a/emummc/source/FS/offsets/1020.h
+++ b/emummc/source/FS/offsets/1020.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_1020_LOCK_MUTEX          0x28910
 #define FS_OFFSET_1020_UNLOCK_MUTEX        0x28960

-#define FS_OFFSET_1020_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_1020_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x142740

 // Misc Data
--- a/emummc/source/FS/offsets/1020_exfat.h
+++ b/emummc/source/FS/offsets/1020_exfat.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_1020_EXFAT_LOCK_MUTEX          0x28910
 #define FS_OFFSET_1020_EXFAT_UNLOCK_MUTEX        0x28960

-#define FS_OFFSET_1020_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_1020_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x142740

 // Misc Data
--- a/emummc/source/FS/offsets/1100.h
+++ b/emummc/source/FS/offsets/1100.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_1100_LOCK_MUTEX          0x28FF0
 #define FS_OFFSET_1100_UNLOCK_MUTEX        0x29040

-#define FS_OFFSET_1100_SDMMC_WRAPPER_CONTROLLER_OPEN  0x14B840
 #define FS_OFFSET_1100_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x14B8F0

 // Misc Data
--- a/emummc/source/FS/offsets/1100_exfat.h
+++ b/emummc/source/FS/offsets/1100_exfat.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_1100_EXFAT_LOCK_MUTEX          0x28FF0
 #define FS_OFFSET_1100_EXFAT_UNLOCK_MUTEX        0x29040

-#define FS_OFFSET_1100_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0x14B840
 #define FS_OFFSET_1100_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x14B8F0

 // Misc Data
--- a/emummc/source/FS/offsets/200.h
+++ b/emummc/source/FS/offsets/200.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_200_LOCK_MUTEX          0x3264
 #define FS_OFFSET_200_UNLOCK_MUTEX        0x32D0

-#define FS_OFFSET_200_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_200_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x733F4

 // Misc Data
--- a/emummc/source/FS/offsets/200_exfat.h
+++ b/emummc/source/FS/offsets/200_exfat.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_200_EXFAT_LOCK_MUTEX          0x3264
 #define FS_OFFSET_200_EXFAT_UNLOCK_MUTEX        0x32D0

-#define FS_OFFSET_200_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_200_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x733F4

 // Misc Data
--- a/emummc/source/FS/offsets/210.h
+++ b/emummc/source/FS/offsets/210.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_210_LOCK_MUTEX          0x3264
 #define FS_OFFSET_210_UNLOCK_MUTEX        0x32D0

-#define FS_OFFSET_210_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_210_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x737D4

 // Misc Data
--- a/emummc/source/FS/offsets/210_exfat.h
+++ b/emummc/source/FS/offsets/210_exfat.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_210_EXFAT_LOCK_MUTEX          0x3264
 #define FS_OFFSET_210_EXFAT_UNLOCK_MUTEX        0x32D0

-#define FS_OFFSET_210_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_210_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x737D4

 // Misc Data
--- a/emummc/source/FS/offsets/300.h
+++ b/emummc/source/FS/offsets/300.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_300_LOCK_MUTEX          0x35CC
 #define FS_OFFSET_300_UNLOCK_MUTEX        0x3638

-#define FS_OFFSET_300_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_300_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x8A270

 // Misc Data
--- a/emummc/source/FS/offsets/300_exfat.h
+++ b/emummc/source/FS/offsets/300_exfat.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_300_EXFAT_LOCK_MUTEX          0x35CC
 #define FS_OFFSET_300_EXFAT_UNLOCK_MUTEX        0x3638

-#define FS_OFFSET_300_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_300_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x8A270

 // Misc Data
--- a/emummc/source/FS/offsets/301.h
+++ b/emummc/source/FS/offsets/301.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_301_LOCK_MUTEX          0x3638
 #define FS_OFFSET_301_UNLOCK_MUTEX        0x36A4

-#define FS_OFFSET_301_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_301_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x8A32C

 // Misc Data
--- a/emummc/source/FS/offsets/301_exfat.h
+++ b/emummc/source/FS/offsets/301_exfat.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_301_EXFAT_LOCK_MUTEX          0x3638
 #define FS_OFFSET_301_EXFAT_UNLOCK_MUTEX        0x36A4

-#define FS_OFFSET_301_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_301_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x8A32C

 // Misc Data
--- a/emummc/source/FS/offsets/400.h
+++ b/emummc/source/FS/offsets/400.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_400_LOCK_MUTEX          0x39A0
 #define FS_OFFSET_400_UNLOCK_MUTEX        0x3A0C

-#define FS_OFFSET_400_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_400_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x9DB48

 // Misc Data
--- a/emummc/source/FS/offsets/400_exfat.h
+++ b/emummc/source/FS/offsets/400_exfat.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_400_EXFAT_LOCK_MUTEX          0x39A0
 #define FS_OFFSET_400_EXFAT_UNLOCK_MUTEX        0x3A0C

-#define FS_OFFSET_400_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_400_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x9DB48

 // Misc Data
--- a/emummc/source/FS/offsets/410.h
+++ b/emummc/source/FS/offsets/410.h
@@ -34,8 +34,7 @@
 #define FS_OFFSET_410_LOCK_MUTEX          0x39A0
 #define FS_OFFSET_410_UNLOCK_MUTEX        0x3A0C

-#define FS_OFFSET_410_SDMMC_WRAPPER_CONTROLLER_OPEN  0
-#define FS_OFFSET_410_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x9DBAC
+#define FS_OFFSET_410_SDMMC_WRAPPER_CONTROLLER_CLOSE        0x9DBAC

 // Misc Data
 #define FS_OFFSET_410_SD_MUTEX            0xE80268
--- a/emummc/source/FS/offsets/410_exfat.h
+++ b/emummc/source/FS/offsets/410_exfat.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_410_EXFAT_LOCK_MUTEX          0x39A0
 #define FS_OFFSET_410_EXFAT_UNLOCK_MUTEX        0x3A0C

-#define FS_OFFSET_410_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_410_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x9DBAC

 // Misc Data
--- a/emummc/source/FS/offsets/500.h
+++ b/emummc/source/FS/offsets/500.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_500_LOCK_MUTEX          0x4080
 #define FS_OFFSET_500_UNLOCK_MUTEX        0x40D0

-#define FS_OFFSET_500_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_500_SDMMC_WRAPPER_CONTROLLER_CLOSE 0xC9380

 // Misc Data
--- a/emummc/source/FS/offsets/500_exfat.h
+++ b/emummc/source/FS/offsets/500_exfat.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_500_EXFAT_LOCK_MUTEX          0x4080
 #define FS_OFFSET_500_EXFAT_UNLOCK_MUTEX        0x40D0

-#define FS_OFFSET_500_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_500_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0xC9380

 // Misc Data
--- a/emummc/source/FS/offsets/510.h
+++ b/emummc/source/FS/offsets/510.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_510_LOCK_MUTEX          0x4080
 #define FS_OFFSET_510_UNLOCK_MUTEX        0x40D0

-#define FS_OFFSET_510_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_510_SDMMC_WRAPPER_CONTROLLER_CLOSE 0xC9750

 // Misc Data
--- a/emummc/source/FS/offsets/510_exfat.h
+++ b/emummc/source/FS/offsets/510_exfat.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_510_EXFAT_LOCK_MUTEX          0x4080
 #define FS_OFFSET_510_EXFAT_UNLOCK_MUTEX        0x40D0

-#define FS_OFFSET_510_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_510_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0xC9750

 // Misc Data
--- a/emummc/source/FS/offsets/600.h
+++ b/emummc/source/FS/offsets/600.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_600_LOCK_MUTEX          0x1412C0
 #define FS_OFFSET_600_UNLOCK_MUTEX        0x141310

-#define FS_OFFSET_600_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_600_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x148500

 // Misc Data
--- a/emummc/source/FS/offsets/600_exfat.h
+++ b/emummc/source/FS/offsets/600_exfat.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_600_EXFAT_LOCK_MUTEX          0x14C9C0
 #define FS_OFFSET_600_EXFAT_UNLOCK_MUTEX        0x14CA10

-#define FS_OFFSET_600_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_600_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x153C00

 // Misc Data
--- a/emummc/source/FS/offsets/700.h
+++ b/emummc/source/FS/offsets/700.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_700_LOCK_MUTEX          0x148A90
 #define FS_OFFSET_700_UNLOCK_MUTEX        0x148AE0

-#define FS_OFFSET_700_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_700_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x14FD50

 // Misc Data
--- a/emummc/source/FS/offsets/700_exfat.h
+++ b/emummc/source/FS/offsets/700_exfat.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_700_EXFAT_LOCK_MUTEX          0x154040
 #define FS_OFFSET_700_EXFAT_UNLOCK_MUTEX        0x154090

-#define FS_OFFSET_700_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_700_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x15B300

 // Misc Data
--- a/emummc/source/FS/offsets/800.h
+++ b/emummc/source/FS/offsets/800.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_800_LOCK_MUTEX          0x14B6D0
 #define FS_OFFSET_800_UNLOCK_MUTEX        0x14B720

-#define FS_OFFSET_800_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_800_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1529E0

 // Misc Data
--- a/emummc/source/FS/offsets/800_exfat.h
+++ b/emummc/source/FS/offsets/800_exfat.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_800_EXFAT_LOCK_MUTEX          0x156C80
 #define FS_OFFSET_800_EXFAT_UNLOCK_MUTEX        0x156CD0

-#define FS_OFFSET_800_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_800_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x15DF90

 // Misc Data
--- a/emummc/source/FS/offsets/810.h
+++ b/emummc/source/FS/offsets/810.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_810_LOCK_MUTEX          0x14B6D0
 #define FS_OFFSET_810_UNLOCK_MUTEX        0x14B720

-#define FS_OFFSET_810_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_810_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1529E0

 // Misc Data
--- a/emummc/source/FS/offsets/810_exfat.h
+++ b/emummc/source/FS/offsets/810_exfat.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_810_EXFAT_LOCK_MUTEX          0x156C80
 #define FS_OFFSET_810_EXFAT_UNLOCK_MUTEX        0x156CD0

-#define FS_OFFSET_810_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_810_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x15DF90

 // Misc Data
--- a/emummc/source/FS/offsets/900.h
+++ b/emummc/source/FS/offsets/900.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_900_LOCK_MUTEX          0x25280
 #define FS_OFFSET_900_UNLOCK_MUTEX        0x252D0

-#define FS_OFFSET_900_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_900_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x137740

 // Misc Data
--- a/emummc/source/FS/offsets/900_exfat.h
+++ b/emummc/source/FS/offsets/900_exfat.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_900_EXFAT_LOCK_MUTEX          0x25280
 #define FS_OFFSET_900_EXFAT_UNLOCK_MUTEX        0x252D0

-#define FS_OFFSET_900_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_900_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x137740

 // Misc Data
--- a/emummc/source/FS/offsets/910.h
+++ b/emummc/source/FS/offsets/910.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_910_LOCK_MUTEX          0x25280
 #define FS_OFFSET_910_UNLOCK_MUTEX        0x252D0

-#define FS_OFFSET_910_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_910_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x137750

 // Misc Data
--- a/emummc/source/FS/offsets/910_exfat.h
+++ b/emummc/source/FS/offsets/910_exfat.h
@@ -34,7 +34,6 @@
 #define FS_OFFSET_910_EXFAT_LOCK_MUTEX          0x25280
 #define FS_OFFSET_910_EXFAT_UNLOCK_MUTEX        0x252D0

-#define FS_OFFSET_910_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0
 #define FS_OFFSET_910_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x137750

 // Misc Data
--- a/emummc/source/emuMMC/emummc.c
+++ b/emummc/source/emuMMC/emummc.c
@@ -271,7 +271,7 @@ int sdmmc_nand_get_active_partition_index()

 static uint64_t emummc_read_write_inner(void *buf, unsigned int sector, unsigned int num_sectors, bool is_write)
 {
-    if ((emuMMC_ctx.EMMC_Type == emuMMC_SD_Raw))
+    if ((emuMMC_ctx.EMMC_Type == emuMMC_SD))
    {
        // raw partition sector offset: emuMMC_ctx.EMMC_StoragePartitionOffset.
        sector += emuMMC_ctx.EMMC_StoragePartitionOffset;
@@ -318,31 +318,6 @@ static uint64_t emummc_read_write_inner(void *buf, unsigned int sector, unsigned
    return res;
 }

-// Controller open wrapper
-uint64_t sdmmc_wrapper_controller_open(int mmc_id)
-{
-    uint64_t result;
-    sdmmc_accessor_t *_this;
-    _this = sdmmc_accessor_get(mmc_id);
-
-    if (_this != NULL)
-    {
-        // Lock eMMC xfer while SD card is being initialized by FS.
-        if (_this == sdmmc_accessor_get(FS_SDMMC_SD))
-            mutex_lock_handler(FS_SDMMC_EMMC); // Recursive Mutex, handler will lock SD as well if custom_driver
-
-        result = _this->vtab->sdmmc_accessor_controller_open(_this);
-
-        // Unlock eMMC.
-        if (_this == sdmmc_accessor_get(FS_SDMMC_SD))
-            mutex_unlock_handler(FS_SDMMC_EMMC);
-
-        return result;
-    }
-
-    fatal_abort(Fatal_OpenAccessor);
-}
-
 // Controller close wrapper
 uint64_t sdmmc_wrapper_controller_close(int mmc_id)
 {
@@ -414,7 +389,7 @@ uint64_t sdmmc_wrapper_read(void *buf, uint64_t bufSize, int mmc_id, unsigned in
            if (first_sd_read)
            {
                first_sd_read = false;
-                if (emuMMC_ctx.EMMC_Type == emuMMC_SD_Raw)
+                if (emuMMC_ctx.EMMC_Type == emuMMC_SD)
                {
                    // Because some SD cards have issues with emuMMC's driver
                    // we currently swap to FS's driver after first SD read
@@ -425,7 +400,7 @@ uint64_t sdmmc_wrapper_read(void *buf, uint64_t bufSize, int mmc_id, unsigned in
                }
            }

-            // Call hekate's driver.
+            // Call hekates driver.
            if (sdmmc_storage_read(&sd_storage, sector, num_sectors, buf))
            {
                mutex_unlock_handler(mmc_id);
--- a/emummc/source/emuMMC/emummc.h
+++ b/emummc/source/emuMMC/emummc.h
@@ -52,7 +52,6 @@ void mutex_lock_handler(int mmc_id);
 void mutex_unlock_handler(int mmc_id);

 // Hooks
-uint64_t sdmmc_wrapper_controller_open(int mmc_id);
 uint64_t sdmmc_wrapper_controller_close(int mmc_id);
 uint64_t sdmmc_wrapper_read(void *buf, uint64_t bufSize, int mmc_id, unsigned int sector, unsigned int num_sectors);
 uint64_t sdmmc_wrapper_write(int mmc_id, unsigned int sector, unsigned int num_sectors, void *buf, uint64_t bufSize);
--- a/emummc/source/emuMMC/emummc_ctx.h
+++ b/emummc/source/emuMMC/emummc_ctx.h
@@ -30,7 +30,7 @@ enum emuMMC_Type
    emuMMC_EMMC = 0,

    // SD Device raw
-    emuMMC_SD_Raw,
+    emuMMC_SD,
    // SD Device File
    emuMMC_SD_File,

--- a/emummc/source/main.c
+++ b/emummc/source/main.c
@@ -92,7 +92,7 @@ volatile __attribute__((aligned(0x1000))) emuMMC_ctx_t emuMMC_ctx = {
    .fs_ver = FS_VER_MAX,

    // SD Default Metadata
-    .SD_Type = emuMMC_SD_Raw,
+    .SD_Type = emuMMC_SD,
    .SD_StoragePartitionOffset = 0,

    // EMMC Default Metadata
@@ -285,9 +285,6 @@ void setup_hooks(void)
    INJECT_HOOK(fs_offsets->sdmmc_wrapper_read, sdmmc_wrapper_read);
    // sdmmc_wrapper_write hook
    INJECT_HOOK(fs_offsets->sdmmc_wrapper_write, sdmmc_wrapper_write);
-	// sdmmc_wrapper_controller_open hook
-    if (fs_offsets->sdmmc_accessor_controller_open)
-        INJECT_HOOK(fs_offsets->sdmmc_accessor_controller_open, sdmmc_wrapper_controller_open);
    // sdmmc_wrapper_controller_close hook
    INJECT_HOOK(fs_offsets->sdmmc_accessor_controller_close, sdmmc_wrapper_controller_close);

@@ -349,7 +346,7 @@ static void load_emummc_ctx(void)
        emuMMC_ctx.id = config.base_cfg.id;
        emuMMC_ctx.EMMC_Type = (enum emuMMC_Type)config.base_cfg.type;
        emuMMC_ctx.fs_ver = (enum FS_VER)config.base_cfg.fs_version;
-        if (emuMMC_ctx.EMMC_Type == emuMMC_SD_Raw)
+        if (emuMMC_ctx.EMMC_Type == emuMMC_SD)
        {
            emuMMC_ctx.EMMC_StoragePartitionOffset = config.partition_cfg.start_sector;
        }
--- a/exosphere/program/source/boot/secmon_boot_setup.cpp
+++ b/exosphere/program/source/boot/secmon_boot_setup.cpp
@@ -72,9 +72,6 @@ namespace ams::secmon::boot {
            /* care of it here. Perhaps we should read the number of anti-downgrade fuses burnt, and translate that */
            /* to the warmboot key? To be decided during the process of implementing ams-on-mariko support. */
            reg::Write(pmc + APBDEV_PMC_SECURE_SCRATCH32, 0x129);
-
-            /* TODO: Fix to ensure correct scratch contents on mariko, as otherwise wb is broken. */
-            AMS_ABORT_UNLESS(fuse::GetSocType() != fuse::SocType_Mariko);
        }

        /* This function derives the master kek and device keys using the tsec root key. */
--- a/exosphere/program/source/secmon_setup.cpp
+++ b/exosphere/program/source/secmon_setup.cpp
@@ -960,7 +960,7 @@ namespace ams::secmon {
        }

        void SetupLogForBoot() {
-            log::Initialize(secmon::GetLogPort(), secmon::GetLogBaudRate(), secmon::GetLogFlags());
+            log::Initialize();
            log::SendText("OHAYO\n", 6);
            log::Flush();
        }
--- a/exosphere/program/source/smc/secmon_smc_info.cpp
+++ b/exosphere/program/source/smc/secmon_smc_info.cpp
@@ -47,7 +47,7 @@ namespace ams::secmon::smc {
            [fuse::DramId_IcosaSamsung4GB]    = pkg1::MemorySize_4GB,
            [fuse::DramId_IcosaHynix4GB]      = pkg1::MemorySize_4GB,
            [fuse::DramId_IcosaMicron4GB]     = pkg1::MemorySize_4GB,
-            [fuse::DramId_FiveHynix1y4GB]     = pkg1::MemorySize_4GB,
+            [fuse::DramId_CopperSamsung4GB]   = pkg1::MemorySize_4GB,
            [fuse::DramId_IcosaSamsung6GB]    = pkg1::MemorySize_6GB,
            [fuse::DramId_CopperHynix4GB]     = pkg1::MemorySize_4GB,
            [fuse::DramId_CopperMicron4GB]    = pkg1::MemorySize_4GB,
@@ -66,13 +66,9 @@ namespace ams::secmon::smc {
            [fuse::DramId_HoagSamsung1y4GBX]  = pkg1::MemorySize_4GB,
            [fuse::DramId_IowaSamsung1y4GBY]  = pkg1::MemorySize_4GB,
            [fuse::DramId_IowaSamsung1y8GBY]  = pkg1::MemorySize_8GB,
-            [fuse::DramId_FiveSamsung1y4GB]   = pkg1::MemorySize_4GB,
-            [fuse::DramId_HoagSamsung1y8GBX]  = pkg1::MemorySize_8GB,
-            [fuse::DramId_FiveSamsung1y4GBX]  = pkg1::MemorySize_4GB,
-            [fuse::DramId_IowaMicron1y4GB]    = pkg1::MemorySize_4GB,
-            [fuse::DramId_HoagMicron1y4GB]    = pkg1::MemorySize_4GB,
-            [fuse::DramId_FiveMicron1y4GB]    = pkg1::MemorySize_4GB,
+            [fuse::DramId_IowaSamsung1y4GBA]  = pkg1::MemorySize_4GB,
            [fuse::DramId_FiveSamsung1y8GBX]  = pkg1::MemorySize_8GB,
+            [fuse::DramId_FiveSamsung1y4GBX]  = pkg1::MemorySize_4GB,
        };

        constexpr const pkg1::MemoryMode MemoryModes[] = {
@@ -282,10 +278,6 @@ namespace ams::secmon::smc {
                        return SmcResult::NotInitialized;
                    }
                    break;
-                case ConfigItem::ExosphereLogConfiguration:
-                    /* Get the log configuration. */
-                    args.r[1] = (static_cast<u64>(static_cast<u8>(secmon::GetLogPort())) << 32) | static_cast<u64>(secmon::GetLogBaudRate());
-                    break;
                default:
                    return SmcResult::InvalidArgument;
            }
--- a/exosphere/program/source/smc/secmon_smc_info.hpp
+++ b/exosphere/program/source/smc/secmon_smc_info.hpp
@@ -40,16 +40,15 @@ namespace ams::secmon::smc {
        Package2Hash                  = 17,

        /* Extension config items for exosphere. */
-        ExosphereApiVersion       = 65000,
-        ExosphereNeedsReboot      = 65001,
-        ExosphereNeedsShutdown    = 65002,
-        ExosphereGitCommitHash    = 65003,
-        ExosphereHasRcmBugPatch   = 65004,
-        ExosphereBlankProdInfo    = 65005,
-        ExosphereAllowCalWrites   = 65006,
-        ExosphereEmummcType       = 65007,
-        ExospherePayloadAddress   = 65008,
-        ExosphereLogConfiguration = 65009,
+        ExosphereApiVersion     = 65000,
+        ExosphereNeedsReboot    = 65001,
+        ExosphereNeedsShutdown  = 65002,
+        ExosphereGitCommitHash  = 65003,
+        ExosphereHasRcmBugPatch = 65004,
+        ExosphereBlankProdInfo  = 65005,
+        ExosphereAllowCalWrites = 65006,
+        ExosphereEmummcType     = 65007,
+        ExospherePayloadAddress = 65008,
    };

    SmcResult SmcGetConfigUser(SmcArguments &args);
--- a/exosphere/program/source/smc/secmon_smc_power_management.cpp
+++ b/exosphere/program/source/smc/secmon_smc_power_management.cpp
@@ -409,7 +409,6 @@ namespace ams::secmon::smc {
            /* NOTE: Nintendo only does this on dev, but we will always do it. */
            if (true /* !pkg1::IsProduction() */) {
                log::SendText("OYASUMI\n", 8);
-                log::Flush();
            }

            /* If we're on erista, configure the bootrom to allow our custom warmboot firmware. */
--- a/fusee/fusee-secondary/src/exocfg.h
+++ b/fusee/fusee-secondary/src/exocfg.h
@@ -34,17 +34,11 @@
 #define EXOSPHERE_FLAG_BLANK_PRODINFO                       (1 << 5u)
 #define EXOSPHERE_FLAG_ALLOW_WRITING_TO_CAL_SYSMMC          (1 << 6u)

-#define EXOSPHERE_LOG_FLAG_INVERTED (1 << 0u)
-
 typedef struct {
    uint32_t magic;
    uint32_t target_firmware;
-    uint32_t flags[2];
-    uint16_t lcd_vendor;
-    uint8_t  log_port;
-    uint8_t  log_flags;
-    uint32_t log_baud_rate;
-    uint32_t reserved1[2];
+    uint32_t flags;
+    uint32_t reserved[5];
    exo_emummc_config_t emummc_cfg;
 } exosphere_config_t;

@@ -60,9 +54,6 @@ _Static_assert(sizeof(exosphere_config_t) == 0x20 + sizeof(exo_emummc_config_t),
 #define EXOSPHERE_BLANK_PRODINFO_SYSMMC_KEY "blank_prodinfo_sysmmc"
 #define EXOSPHERE_BLANK_PRODINFO_EMUMMC_KEY "blank_prodinfo_emummc"
 #define EXOSPHERE_ALLOW_WRITING_TO_CAL_SYSMMC_KEY "allow_writing_to_cal_sysmmc"
-#define EXOSPHERE_LOG_PORT_KEY "log_port"
-#define EXOSPHERE_LOG_BAUD_RATE_KEY "log_baud_rate"
-#define EXOSPHERE_LOG_INVERTED_KEY "log_inverted"

 typedef struct {
    int debugmode;
@@ -72,9 +63,6 @@ typedef struct {
    int blank_prodinfo_sysmmc;
    int blank_prodinfo_emummc;
    int allow_writing_to_cal_sysmmc;
-    int log_port;
-    int log_baud_rate;
-    int log_inverted;
 } exosphere_parse_cfg_t;

 #endif
--- a/fusee/fusee-secondary/src/kernel_patches.c
+++ b/fusee/fusee-secondary/src/kernel_patches.c
@@ -543,8 +543,8 @@ static const instruction_t MAKE_KERNEL_PATCH_NAME(1000, proc_id_recv)[] = {0xA9B

 /*
    stp x10, x11, [sp, #-0x10]!
-    ldr x11, [sp, #0x80]
-    mov w10, #3
+    ldr x11, [sp, #0x90]
+    mov w10, w28
    lsl x10, x10, #2
    ldr x10, [x11, x10]
    mov x9, #0x0000ffffffffffff
@@ -567,11 +567,11 @@ static const instruction_t MAKE_KERNEL_PATCH_NAME(1000, proc_id_recv)[] = {0xA9B
    mov x0, x8
 */
 static const uint8_t MAKE_KERNEL_PATTERN_NAME(1100, proc_id_send)[] = {0xE0, 0x03, 0x15, 0xAA, 0xA8, 0x02, 0x40, 0xF9, 0x08, 0x1D, 0x40, 0xF9, 0x00, 0x01, 0x3F, 0xD6, 0x88, 0x4A, 0x3C, 0x8B, 0x09, 0xFC, 0x60, 0xD3, 0x00, 0x25, 0x00, 0x29};
-static const instruction_t MAKE_KERNEL_PATCH_NAME(1100, proc_id_send)[] = {0xA9BF2FEA, 0xF94043EB, 0x5280006A, 0xD37EF54A, 0xF86A696A, 0x92FFFFE9, 0x8A090148, 0xD2FFFFE9, 0x8A09014A, 0xD2FFFFC9, 0xEB09015F, 0x54000100, 0xA9BF27E8, 0xF94002A8, 0xF9401D08, 0xAA1503E0, 0xD63F0100, 0xA8C127E8, 0xAA0003E8, 0xA8C12FEA, 0xAA0803E0};
+static const instruction_t MAKE_KERNEL_PATCH_NAME(1100, proc_id_send)[] = {0xA9BF2FEA, 0xF9404BEB, 0x2A1C03EA, 0xD37EF54A, 0xF86A696A, 0x92FFFFE9, 0x8A090148, 0xD2FFFFE9, 0x8A09014A, 0xD2FFFFC9, 0xEB09015F, 0x54FFFFA0, 0xA9BF27E8, 0xF94002A8, 0xF9401D08, 0xAA1503E0, 0xD63F0100, 0xA8C127E8, 0xAA0003E8, 0xA8C12FEA, 0xAA0803E0};
 /*
    stp x10, x11, [sp, #-0x10]!
    ldr x11, [sp, #0xE0]
-    mov w10, #3
+    ldr w10, [sp, #0xC0]
    lsl x10, x10, #2
    ldr x10, [x11, x10]
    mov x9, #0x0000ffffffffffff
@@ -594,7 +594,7 @@ static const instruction_t MAKE_KERNEL_PATCH_NAME(1100, proc_id_send)[] = {0xA9B
    mov x0, x8
 */
 static const uint8_t MAKE_KERNEL_PATTERN_NAME(1100, proc_id_recv)[] = {0x08, 0x03, 0x40, 0xF9, 0xE0, 0x03, 0x18, 0xAA, 0x08, 0x1D, 0x40, 0xF9, 0x00, 0x01, 0x3F, 0xD6, 0xE8, 0x7F, 0x40, 0xF9, 0x09, 0xFC, 0x60, 0xD3, 0xEA, 0x5B, 0x40, 0xF9};
-static const instruction_t MAKE_KERNEL_PATCH_NAME(1100, proc_id_recv)[] = {0xA9BF2FEA, 0xF94073EB, 0x5280006A, 0xD37EF54A, 0xF86A696A, 0x92FFFFE9, 0x8A090148, 0xD2FFFFE9, 0x8A09014A, 0xD2FFFFC9, 0xEB09015F, 0x54000100, 0xA9BF27E8, 0xF9400308, 0xF9401D08, 0xAA1803E0, 0xD63F0100, 0xA8C127E8, 0xAA0003E8, 0xA8C12FEA, 0xAA0803E0};
+static const instruction_t MAKE_KERNEL_PATCH_NAME(1100, proc_id_recv)[] = {0xA9BF2FEA, 0xF94073EB, 0xB940C3EA, 0xD37EF54A, 0xF86A696A, 0x92FFFFE9, 0x8A090148, 0xD2FFFFE9, 0x8A09014A, 0xD2FFFFC9, 0xEB09015F, 0x54FFFFA0, 0xA9BF27E8, 0xF9400308, 0xF9401D08, 0xAA1803E0, 0xD63F0100, 0xA8C127E8, 0xAA0003E8, 0xA8C12FEA, 0xAA0803E0};

 /* svcControlCodeMemory Patches */
 /* b.eq -> nop */
@@ -906,35 +906,6 @@ static const kernel_patch_t g_kernel_patches_1100[] = {
    }
 };

-static const kernel_patch_t g_kernel_patches_1101[] = {
-    {   /* Send Message Process ID Patch. */
-        .pattern_size = 0x1C,
-        .pattern = MAKE_KERNEL_PATTERN_NAME(1100, proc_id_send),
-        .pattern_hook_offset = 0x0,
-        .payload_num_instructions = sizeof(MAKE_KERNEL_PATCH_NAME(1100, proc_id_send))/sizeof(instruction_t),
-        .branch_back_offset = 0x10,
-        .payload = MAKE_KERNEL_PATCH_NAME(1100, proc_id_send)
-    },
-    {   /* Receive Message Process ID Patch. */
-        .pattern_size = 0x1C,
-        .pattern = MAKE_KERNEL_PATTERN_NAME(1100, proc_id_recv),
-        .pattern_hook_offset = 0x0,
-        .payload_num_instructions = sizeof(MAKE_KERNEL_PATCH_NAME(1100, proc_id_recv))/sizeof(instruction_t),
-        .branch_back_offset = 0x10,
-        .payload = MAKE_KERNEL_PATCH_NAME(1100, proc_id_recv)
-    },
-    {   /* svcControlCodeMemory Patch. */
-        .payload_num_instructions = sizeof(MAKE_KERNEL_PATCH_NAME(1100, svc_control_codememory))/sizeof(instruction_t),
-        .payload = MAKE_KERNEL_PATCH_NAME(1100, svc_control_codememory),
-        .patch_offset = 0x2FD04,
-    },
-    {   /* System Memory Increase Patch. */
-        .payload_num_instructions = sizeof(MAKE_KERNEL_PATCH_NAME(1100, system_memory_increase))/sizeof(instruction_t),
-        .payload = MAKE_KERNEL_PATCH_NAME(1100, system_memory_increase),
-        .patch_offset = 0x490C4,
-    }
-};
-
 #define KERNEL_PATCHES(vers) .num_patches = sizeof(g_kernel_patches_##vers)/sizeof(kernel_patch_t), .patches = g_kernel_patches_##vers,

 /* Kernel Infos. */
@@ -1029,15 +1000,6 @@ static const kernel_info_t g_kernel_infos[] = {
        .embedded_ini_ptr = 0x180,
        .free_code_space_offset = 0x49EE8,
        KERNEL_PATCHES(1100)
-    },
-    {   /* 11.0.1. */
-        .hash = {0x68, 0xB9, 0x72, 0xB7, 0x97, 0x55, 0x87, 0x5E, 0x24, 0x95, 0x8D, 0x99, 0x0A, 0x77, 0xAB, 0xF1, 0xC5, 0xC1, 0x32, 0x80, 0x67, 0xF0, 0xA2, 0xEC, 0x9C, 0xEF, 0xC3, 0x22, 0xE3, 0x42, 0xC0, 0x4D, },
-        .hash_offset = 0x1C4,
-        .hash_size = 0x69000 - 0x1C4,
-        .embedded_ini_offset = 0x69000,
-        .embedded_ini_ptr = 0x180,
-        .free_code_space_offset = 0x49EE8,
-        KERNEL_PATCHES(1101)
    }
 };

@@ -1128,7 +1090,7 @@ void package2_patch_kernel(void *_kernel, size_t *kernel_size, bool is_sd_kernel

        uint8_t *pattern_loc = search_pattern(kernel, *kernel_size, kernel_info->patches[i].pattern, kernel_info->patches[i].pattern_size);
        if (pattern_loc == NULL) {
-            fatal_error("kernel_patcher: failed to identify patch location!\n");
+            /* TODO: Should we print an error/abort here? */
            continue;
        }
        /* Patch kernel to branch to our hook at the desired place. */
--- a/fusee/fusee-secondary/src/nxboot.c
+++ b/fusee/fusee-secondary/src/nxboot.c
@@ -196,27 +196,6 @@ static int exosphere_ini_handler(void *user, const char *section, const char *na
            } else if (tmp == 0) {
                parse_cfg->allow_writing_to_cal_sysmmc = 0;
            }
-        } else if (strcmp(name, EXOSPHERE_LOG_PORT_KEY) == 0) {
-            sscanf(value, "%d", &tmp);
-            if (0 <= tmp && tmp < 4) {
-                parse_cfg->log_port = tmp;
-            } else {
-                parse_cfg->log_port = 0;
-            }
-        } else if (strcmp(name, EXOSPHERE_LOG_BAUD_RATE_KEY) == 0) {
-            sscanf(value, "%d", &tmp);
-            if (tmp > 0) {
-                parse_cfg->log_baud_rate = tmp;
-            } else {
-                parse_cfg->log_baud_rate = 115200;
-            }
-        } else if (strcmp(name, EXOSPHERE_LOG_INVERTED_KEY) == 0) {
-            sscanf(value, "%d", &tmp);
-            if (tmp == 1) {
-                parse_cfg->log_inverted = 1;
-            } else if (tmp == 0) {
-                parse_cfg->log_inverted = 0;
-            }
        } else {
            return 0;
        }
@@ -261,7 +240,6 @@ static uint32_t nxboot_get_specific_target_firmware(uint32_t target_firmware){
    #define CHECK_NCA(NCA_ID, VERSION) do { if (is_nca_present(NCA_ID)) { return ATMOSPHERE_TARGET_FIRMWARE_##VERSION; } } while(0)

    if (target_firmware >= ATMOSPHERE_TARGET_FIRMWARE_11_0_0) {
-        CHECK_NCA("56211c7a5ed20a5332f5cdda67121e37", 11_0_1);
        CHECK_NCA("594c90bcdbcccad6b062eadba0cd0e7e", 11_0_0);
    } else if (target_firmware >= ATMOSPHERE_TARGET_FIRMWARE_10_0_0) {
        CHECK_NCA("26325de4db3909e0ef2379787c7e671d", 10_2_0);
@@ -486,9 +464,9 @@ static void nxboot_configure_exosphere(uint32_t target_firmware, unsigned int ke
    const bool is_emummc = exo_emummc_cfg->base_cfg.magic == MAGIC_EMUMMC_CONFIG && exo_emummc_cfg->base_cfg.type != EMUMMC_TYPE_NONE;

    if (keygen_type) {
-        exo_cfg.flags[0] = EXOSPHERE_FLAG_PERFORM_620_KEYGEN;
+        exo_cfg.flags = EXOSPHERE_FLAG_PERFORM_620_KEYGEN;
    } else {
-        exo_cfg.flags[0] = 0;
+        exo_cfg.flags = 0;
    }

    /* Setup exosphere parse configuration with defaults. */
@@ -500,9 +478,6 @@ static void nxboot_configure_exosphere(uint32_t target_firmware, unsigned int ke
        .blank_prodinfo_sysmmc              = 0,
        .blank_prodinfo_emummc              = 0,
        .allow_writing_to_cal_sysmmc        = 0,
-        .log_port                           = 0,
-        .log_baud_rate                      = 115200,
-        .log_inverted                       = 0,
    };

    /* If we have an ini to read, parse it. */
@@ -515,17 +490,13 @@ static void nxboot_configure_exosphere(uint32_t target_firmware, unsigned int ke
    free(exosphere_ini);

    /* Apply parse config. */
-    if (parse_cfg.debugmode)                           exo_cfg.flags[0] |= EXOSPHERE_FLAG_IS_DEBUGMODE_PRIV;
-    if (parse_cfg.debugmode_user)                      exo_cfg.flags[0] |= EXOSPHERE_FLAG_IS_DEBUGMODE_USER;
-    if (parse_cfg.disable_user_exception_handlers)     exo_cfg.flags[0] |= EXOSPHERE_FLAG_DISABLE_USERMODE_EXCEPTION_HANDLERS;
-    if (parse_cfg.enable_user_pmu_access)              exo_cfg.flags[0] |= EXOSPHERE_FLAG_ENABLE_USERMODE_PMU_ACCESS;
-    if (parse_cfg.blank_prodinfo_sysmmc && !is_emummc) exo_cfg.flags[0] |= EXOSPHERE_FLAG_BLANK_PRODINFO;
-    if (parse_cfg.blank_prodinfo_emummc &&  is_emummc) exo_cfg.flags[0] |= EXOSPHERE_FLAG_BLANK_PRODINFO;
-    if (parse_cfg.allow_writing_to_cal_sysmmc)         exo_cfg.flags[0] |= EXOSPHERE_FLAG_ALLOW_WRITING_TO_CAL_SYSMMC;
-
-    exo_cfg.log_port      = parse_cfg.log_port;
-    exo_cfg.log_baud_rate = parse_cfg.log_baud_rate;
-    if (parse_cfg.log_inverted) exo_cfg.log_flags |= EXOSPHERE_LOG_FLAG_INVERTED;
+    if (parse_cfg.debugmode)                           exo_cfg.flags |= EXOSPHERE_FLAG_IS_DEBUGMODE_PRIV;
+    if (parse_cfg.debugmode_user)                      exo_cfg.flags |= EXOSPHERE_FLAG_IS_DEBUGMODE_USER;
+    if (parse_cfg.disable_user_exception_handlers)     exo_cfg.flags |= EXOSPHERE_FLAG_DISABLE_USERMODE_EXCEPTION_HANDLERS;
+    if (parse_cfg.enable_user_pmu_access)              exo_cfg.flags |= EXOSPHERE_FLAG_ENABLE_USERMODE_PMU_ACCESS;
+    if (parse_cfg.blank_prodinfo_sysmmc && !is_emummc) exo_cfg.flags |= EXOSPHERE_FLAG_BLANK_PRODINFO;
+    if (parse_cfg.blank_prodinfo_emummc &&  is_emummc) exo_cfg.flags |= EXOSPHERE_FLAG_BLANK_PRODINFO;
+    if (parse_cfg.allow_writing_to_cal_sysmmc)         exo_cfg.flags |= EXOSPHERE_FLAG_ALLOW_WRITING_TO_CAL_SYSMMC;

    if ((exo_cfg.target_firmware < ATMOSPHERE_TARGET_FIRMWARE_MIN) || (exo_cfg.target_firmware > ATMOSPHERE_TARGET_FIRMWARE_MAX)) {
        fatal_error("[NXBOOT] Invalid Exosphere target firmware!\n");
--- a/libraries/.gitrepo
+++ b/libraries/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/Atmosphere-NX/Atmosphere-libs
 	branch = master
-	commit = 5a18bea64545105c52d642d7789029b5ca875864
-	parent = 17c8c390fc84d059b89f563a8fae6936649d0d45
+	commit = 10e9e0e8f926b11c2c7de16ffe15bea7d7ec2cdf
+	parent = 2ee2a4f1ac04bc7f15de8be8d57ad04d7e73f735
 	method = merge
 	cmdver = 0.4.1
--- a/libraries/config/templates/mesosphere.mk
+++ b/libraries/config/templates/mesosphere.mk
@@ -7,7 +7,7 @@ include  $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/../common.mk
 # options for code generation
 #---------------------------------------------------------------------------------
 export DEFINES     := $(ATMOSPHERE_DEFINES) -DATMOSPHERE_IS_MESOSPHERE
-export SETTINGS    := $(ATMOSPHERE_SETTINGS) -Os -mgeneral-regs-only -ffixed-x18 -Wextra -Werror -fno-non-call-exceptions
+export SETTINGS    := $(ATMOSPHERE_SETTINGS) -O2 -mgeneral-regs-only -ffixed-x18 -Wextra -Werror -fno-non-call-exceptions
 export CFLAGS      := $(ATMOSPHERE_CFLAGS) $(SETTINGS) $(DEFINES) $(INCLUDE)
 export CXXFLAGS    := $(CFLAGS) $(ATMOSPHERE_CXXFLAGS) -fno-use-cxa-atexit
 export ASFLAGS     := $(ATMOSPHERE_ASFLAGS) $(SETTINGS) $(DEFINES) $(INCLUDE)
--- a/libraries/libexosphere/include/exosphere/fuse.hpp
+++ b/libraries/libexosphere/include/exosphere/fuse.hpp
@@ -51,7 +51,7 @@ namespace ams::fuse {
        DramId_IcosaSamsung4GB    =  0,
        DramId_IcosaHynix4GB      =  1,
        DramId_IcosaMicron4GB     =  2,
-        DramId_FiveHynix1y4GB     =  3,
+        DramId_CopperSamsung4GB   =  3,
        DramId_IcosaSamsung6GB    =  4,
        DramId_CopperHynix4GB     =  5,
        DramId_CopperMicron4GB    =  6,
@@ -70,13 +70,9 @@ namespace ams::fuse {
        DramId_HoagSamsung1y4GBX  = 19,
        DramId_IowaSamsung1y4GBY  = 20,
        DramId_IowaSamsung1y8GBY  = 21,
-        DramId_FiveSamsung1y4GB   = 22,
-        DramId_HoagSamsung1y8GBX  = 23,
+        DramId_IowaSamsung1y4GBA  = 22,
+        DramId_FiveSamsung1y8GBX  = 23,
        DramId_FiveSamsung1y4GBX  = 24,
-        DramId_IowaMicron1y4GB    = 25,
-        DramId_HoagMicron1y4GB    = 26,
-        DramId_FiveMicron1y4GB    = 27,
-        DramId_FiveSamsung1y8GBX  = 28,

        DramId_Count,
    };
--- a/libraries/libexosphere/include/exosphere/log.hpp
+++ b/libraries/libexosphere/include/exosphere/log.hpp
@@ -35,7 +35,6 @@ namespace ams::log {
    #endif

    void Initialize();
-    void Initialize(uart::Port port, u32 baud_rate, u32 flags);
    void Finalize();

    void Printf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
--- a/libraries/libexosphere/include/exosphere/secmon/secmon_configuration_context.arch.arm64.hpp
+++ b/libraries/libexosphere/include/exosphere/secmon/secmon_configuration_context.arch.arm64.hpp
@@ -116,18 +116,6 @@ namespace ams::secmon {
        return GetSecmonConfiguration().GetLcdVendor();
    }

-    ALWAYS_INLINE uart::Port GetLogPort() {
-        return GetSecmonConfiguration().GetLogPort();
-    }
-
-    ALWAYS_INLINE u8 GetLogFlags() {
-        return GetSecmonConfiguration().GetLogFlags();
-    }
-
-    ALWAYS_INLINE u32 GetLogBaudRate() {
-        return GetSecmonConfiguration().GetLogBaudRate();
-    }
-
    ALWAYS_INLINE bool IsProduction() {
        return GetSecmonConfiguration().IsProduction();
    }
--- a/libraries/libexosphere/include/exosphere/secmon/secmon_monitor_context.hpp
+++ b/libraries/libexosphere/include/exosphere/secmon/secmon_monitor_context.hpp
@@ -16,7 +16,6 @@
 #pragma once
 #include <vapours.hpp>
 #include <exosphere/fuse.hpp>
-#include <exosphere/uart.hpp>
 #include <exosphere/secmon/secmon_emummc_context.hpp>

 namespace ams::secmon {
@@ -40,10 +39,8 @@ namespace ams::secmon {
        ams::TargetFirmware target_firmware;
        u32 flags[2];
        u16 lcd_vendor;
-        u8  log_port;
-        u8  log_flags;
-        u32 log_baud_rate;
-        u32 reserved1[2];
+        u16 reserved0;
+        u32 reserved1[3];
        EmummcConfiguration emummc_cfg;

        constexpr bool IsValid() const { return this->magic == Magic; }
@@ -57,22 +54,17 @@ namespace ams::secmon {
        u8  hardware_type;
        u8  soc_type;
        u8  hardware_state;
-        u8  log_port;
+        u8  pad_0B[1];
        u32 flags[2];
        u16 lcd_vendor;
-        u8  log_flags;
-        u8  reserved0;
-        u32 log_baud_rate;
-        u32 reserved1[(0x80 - 0x1C) / sizeof(u32)];
+        u16 reserved0;
+        u32 reserved1[(0x80 - 0x18) / sizeof(u32)];

        constexpr void CopyFrom(const SecureMonitorStorageConfiguration &storage) {
            this->target_firmware = storage.target_firmware;
            this->flags[0]        = storage.flags[0];
            this->flags[1]        = storage.flags[1];
            this->lcd_vendor      = storage.lcd_vendor;
-            this->log_port        = storage.log_port;
-            this->log_flags       = storage.log_flags;
-            this->log_baud_rate   = storage.log_baud_rate != 0 ? storage.log_baud_rate : 115200;
        }

        void SetFuseInfo() {
@@ -86,13 +78,9 @@ namespace ams::secmon {
        constexpr fuse::HardwareType  GetHardwareType()  const { return static_cast<fuse::HardwareType>(this->hardware_type); }
        constexpr fuse::SocType       GetSocType()       const { return static_cast<fuse::SocType>(this->soc_type); }
        constexpr fuse::HardwareState GetHardwareState() const { return static_cast<fuse::HardwareState>(this->hardware_state); }
-        constexpr uart::Port GetLogPort() const { return static_cast<uart::Port>(this->log_port); }
-        constexpr u8 GetLogFlags() const { return this->log_flags; }

        constexpr u16 GetLcdVendor() const { return this->lcd_vendor; }

-        constexpr u32 GetLogBaudRate() const { return this->log_baud_rate; }
-
        constexpr bool IsProduction() const { return this->GetHardwareState() != fuse::HardwareState_Development; }

        constexpr bool IsDevelopmentFunctionEnabledForKernel()  const { return (this->flags[0] & SecureMonitorConfigurationFlag_IsDevelopmentFunctionEnabledForKernel)  != 0; }
@@ -113,12 +101,10 @@ namespace ams::secmon {
        .hardware_type   = {},
        .soc_type        = {},
        .hardware_state  = {},
-        .log_port        = uart::Port_ReservedDebug,
+        .pad_0B          = {},
        .flags           = { SecureMonitorConfigurationFlag_Default, SecureMonitorConfigurationFlag_None },
        .lcd_vendor      = {},
-        .log_flags       = {},
        .reserved0       = {},
-        .log_baud_rate   = 115200,
        .reserved1       = {},
    };

--- a/libraries/libexosphere/source/log/log_api.cpp
+++ b/libraries/libexosphere/source/log/log_api.cpp
@@ -19,46 +19,58 @@ namespace ams::log {

    namespace {

-        constexpr inline uart::Port DefaultLogPort = uart::Port_ReservedDebug;
-        constexpr inline u32 DefaultLogFlags = static_cast<u32>(uart::Flag_None);
-        constexpr inline int DefaultBaudRate = 115200;
-        constinit uart::Port g_log_port   = DefaultLogPort;
+        constexpr inline uart::Port UartLogPort = uart::Port_ReservedDebug;
+        constexpr inline int UartBaudRate = 115200;
        constinit bool g_initialized_uart = false;

-        ALWAYS_INLINE void SetupUartClock(uart::Port port) {
-            /* The debug port must always be set up, for compatibility with official hos. */
-            pinmux::SetupUartA();
-            clkrst::EnableUartAClock();
+        constexpr inline u32 UartPortFlags = [] {
+            if constexpr (UartLogPort == uart::Port_ReservedDebug) {
+                /* Logging to the debug port. */
+                /* Don't invert transactions. */
+                return uart::Flag_None;
+            } else if constexpr (UartLogPort == uart::Port_LeftJoyCon) {
+                /* Logging to left joy-con (e.g. with Joyless). */
+                /* Invert transactions. */
+                return uart::Flag_Inverted;
+            } else if constexpr (UartLogPort == uart::Port_RightJoyCon) {
+                /* Logging to right joy-con (e.g. with Joyless). */
+                /* Invert transactions. */
+                return uart::Flag_Inverted;
+            } else {
+                __builtin_unreachable();
+            }
+        }();

-            /* If logging to a joy-con port, configure appropriately. */
-            if (port == uart::Port_LeftJoyCon) {
+        ALWAYS_INLINE void SetupUart() {
+            if constexpr (UartLogPort == uart::Port_ReservedDebug) {
+                /* Logging to the debug port. */
+                pinmux::SetupUartA();
+                clkrst::EnableUartAClock();
+            } else if constexpr (UartLogPort == uart::Port_LeftJoyCon) {
                /* Logging to left joy-con (e.g. with Joyless). */
                static_assert(uart::Port_LeftJoyCon == uart::Port_C);
                pinmux::SetupUartC();
                clkrst::EnableUartCClock();
-            } else if (port == uart::Port_RightJoyCon) {
+            } else if constexpr (UartLogPort == uart::Port_RightJoyCon) {
                /* Logging to right joy-con (e.g. with Joyless). */
                static_assert(uart::Port_RightJoyCon == uart::Port_B);
                pinmux::SetupUartB();
                clkrst::EnableUartBClock();
+            } else {
+                __builtin_unreachable();
            }
        }

    }

    void Initialize() {
-        return Initialize(DefaultLogPort, DefaultBaudRate, DefaultLogFlags);
-    }
-
-    void Initialize(uart::Port port, u32 baud_rate, u32 flags) {
        /* Initialize pinmux and clock for the target uart port. */
-        SetupUartClock(port);
+        SetupUart();

        /* Initialize the target uart port. */
-        uart::Initialize(port, baud_rate, flags);
+        uart::Initialize(UartLogPort, UartBaudRate, UartPortFlags);

        /* Note that we've initialized. */
-        g_log_port        = port;
        g_initialized_uart = true;
    }

@@ -72,7 +84,7 @@ namespace ams::log {
        const auto len = util::TVSNPrintf(log_buf, sizeof(log_buf), fmt, vl);

        if (g_initialized_uart) {
-            uart::SendText(g_log_port, log_buf, len);
+            uart::SendText(UartLogPort, log_buf, len);
        }
    }

@@ -103,13 +115,13 @@ namespace ams::log {

    void SendText(const void *text, size_t size) {
        if (g_initialized_uart) {
-            uart::SendText(g_log_port, text, size);
+            uart::SendText(UartLogPort, text, size);
        }
    }

    void Flush() {
        if (g_initialized_uart) {
-            uart::WaitFlush(g_log_port);
+            uart::WaitFlush(UartLogPort);
        }
    }

--- a/libraries/libmesosphere/Makefile
+++ b/libraries/libmesosphere/Makefile
@@ -11,7 +11,7 @@ include $(CURRENT_DIRECTORY)/../config/common.mk
 PRECOMPILED_HEADERS := include/mesosphere.hpp

 DEFINES     := $(ATMOSPHERE_DEFINES) -DATMOSPHERE_IS_MESOSPHERE
-SETTINGS    := $(ATMOSPHERE_SETTINGS) -Os -mgeneral-regs-only -ffixed-x18 -Wextra -Werror -fno-non-call-exceptions
+SETTINGS    := $(ATMOSPHERE_SETTINGS) -O2 -mgeneral-regs-only -ffixed-x18 -Wextra -Werror -fno-non-call-exceptions
 CFLAGS      := $(ATMOSPHERE_CFLAGS) $(SETTINGS) $(DEFINES) $(INCLUDE)
 CXXFLAGS    := $(CFLAGS) $(ATMOSPHERE_CXXFLAGS) -fno-use-cxa-atexit -flto
 ASFLAGS     := $(ATMOSPHERE_ASFLAGS) $(SETTINGS) $(DEFINES) $(INCLUDE)
--- a/libraries/libmesosphere/include/mesosphere.hpp
+++ b/libraries/libmesosphere/include/mesosphere.hpp
@@ -54,7 +54,6 @@
 #include <mesosphere/kern_kernel.hpp>
 #include <mesosphere/kern_k_page_table_manager.hpp>
 #include <mesosphere/kern_select_page_table.hpp>
-#include <mesosphere/kern_k_dump_object.hpp>

 /* Miscellaneous objects. */
 #include <mesosphere/kern_k_shared_memory_info.hpp>
@@ -78,8 +77,6 @@
 #include <mesosphere/kern_select_debug.hpp>
 #include <mesosphere/kern_k_process.hpp>
 #include <mesosphere/kern_k_resource_limit.hpp>
-#include <mesosphere/kern_k_alpha.hpp>
-#include <mesosphere/kern_k_beta.hpp>

 /* More Miscellaneous objects. */
 #include <mesosphere/kern_k_object_name.hpp>
--- a/libraries/libmesosphere/include/mesosphere/arch/arm64/init/kern_k_init_page_table.hpp
+++ b/libraries/libmesosphere/include/mesosphere/arch/arm64/init/kern_k_init_page_table.hpp
@@ -668,7 +668,6 @@ namespace ams::kern::arch::arm64::init {
                this->PhysicallyRandomize(virt_addr, size, L2BlockSize, do_copy);
                this->PhysicallyRandomize(virt_addr, size, L3ContiguousBlockSize, do_copy);
                this->PhysicallyRandomize(virt_addr, size, L3BlockSize, do_copy);
-                cpu::StoreEntireCacheForInit();
            }

    };
--- a/libraries/libmesosphere/include/mesosphere/arch/arm64/kern_k_debug.hpp
+++ b/libraries/libmesosphere/include/mesosphere/arch/arm64/kern_k_debug.hpp
@@ -44,9 +44,6 @@ namespace ams::kern::arch::arm64 {
            static uintptr_t GetProgramCounter(const KThread &thread);
            static void SetPreviousProgramCounter();

-            static void PrintRegister(KThread *thread = nullptr);
-            static void PrintBacktrace(KThread *thread = nullptr);
-
            static Result BreakIfAttached(ams::svc::BreakReason break_reason, uintptr_t address, size_t size);
            static Result SetHardwareBreakPoint(ams::svc::HardwareBreakPointRegisterName name, u64 flags, u64 value);

@@ -64,6 +61,8 @@ namespace ams::kern::arch::arm64 {
                    }
                }
            }
+
+            /* TODO: This is a placeholder definition. */
    };

 }
--- a/libraries/libmesosphere/include/mesosphere/arch/arm64/kern_k_page_table_impl.hpp
+++ b/libraries/libmesosphere/include/mesosphere/arch/arm64/kern_k_page_table_impl.hpp
@@ -112,7 +112,6 @@ namespace ams::kern::arch::arm64 {
            L1PageTableEntry *Finalize();

            void Dump(uintptr_t start, size_t size) const;
-            size_t CountPageTables() const;

            bool BeginTraversal(TraversalEntry *out_entry, TraversalContext *out_context, KProcessAddress address) const;
            bool ContinueTraversal(TraversalEntry *out_entry, TraversalContext *context) const;
--- a/libraries/libmesosphere/include/mesosphere/arch/arm64/kern_k_process_page_table.hpp
+++ b/libraries/libmesosphere/include/mesosphere/arch/arm64/kern_k_process_page_table.hpp
@@ -232,18 +232,14 @@ namespace ams::kern::arch::arm64 {
                return this->page_table.UnmapPhysicalMemoryUnsafe(address, size);
            }

+            void DumpTable() const {
+                return this->page_table.DumpTable();
+            }
+
            void DumpMemoryBlocks() const {
                return this->page_table.DumpMemoryBlocks();
            }

-            void DumpPageTable() const {
-                return this->page_table.DumpPageTable();
-            }
-
-            size_t CountPageTables() const {
-                return this->page_table.CountPageTables();
-            }
-
            bool GetPhysicalAddress(KPhysicalAddress *out, KProcessAddress address) const {
                return this->page_table.GetPhysicalAddress(out, address);
            }
@@ -271,22 +267,12 @@ namespace ams::kern::arch::arm64 {

            size_t GetNormalMemorySize() const { return this->page_table.GetNormalMemorySize(); }

-            size_t GetCodeSize() const { return this->page_table.GetCodeSize(); }
-            size_t GetCodeDataSize() const { return this->page_table.GetCodeDataSize(); }
-
-            size_t GetAliasCodeSize() const { return this->page_table.GetAliasCodeSize(); }
-            size_t GetAliasCodeDataSize() const { return this->page_table.GetAliasCodeDataSize(); }
-
            u32 GetAllocateOption() const { return this->page_table.GetAllocateOption(); }

            KPhysicalAddress GetHeapPhysicalAddress(KVirtualAddress address) const {
                return this->page_table.GetHeapPhysicalAddress(address);
            }

-            KVirtualAddress GetHeapVirtualAddress(KPhysicalAddress address) const {
-                return this->page_table.GetHeapVirtualAddress(address);
-            }
-
            KBlockInfoManager *GetBlockInfoManager() {
                return this->page_table.GetBlockInfoManager();
            }
--- a/libraries/libmesosphere/include/mesosphere/arch/arm64/kern_k_spin_lock.hpp
+++ b/libraries/libmesosphere/include/mesosphere/arch/arm64/kern_k_spin_lock.hpp
@@ -25,7 +25,7 @@ namespace ams::kern::arch::arm64 {
        public:
            constexpr KNotAlignedSpinLock() : packed_tickets(0) { /* ... */ }

-            ALWAYS_INLINE void Lock() {
+            void Lock() {
                u32 tmp0, tmp1, tmp2;

                __asm__ __volatile__(
@@ -52,7 +52,7 @@ namespace ams::kern::arch::arm64 {
                );
            }

-            ALWAYS_INLINE void Unlock() {
+            void Unlock() {
                const u32 value = this->packed_tickets + 1;
                __asm__ __volatile__(
                    "    stlrh %w[value], %[packed_tickets]\n"
@@ -71,7 +71,7 @@ namespace ams::kern::arch::arm64 {
        public:
            constexpr KAlignedSpinLock() : current_ticket(0), next_ticket(0) { /* ... */ }

-            ALWAYS_INLINE void Lock() {
+            void Lock() {
                u32 tmp0, tmp1, got_lock;

                __asm__ __volatile__(
@@ -94,7 +94,7 @@ namespace ams::kern::arch::arm64 {
                );
            }

-            ALWAYS_INLINE void Unlock() {
+            void Unlock() {
                const u32 value = this->current_ticket + 1;
                __asm__ __volatile__(
                    "    stlrh %w[value], %[current_ticket]\n"
--- a/libraries/libmesosphere/include/mesosphere/arch/arm64/kern_k_supervisor_page_table.hpp
+++ b/libraries/libmesosphere/include/mesosphere/arch/arm64/kern_k_supervisor_page_table.hpp
@@ -62,18 +62,6 @@ namespace ams::kern::arch::arm64 {
            }

            constexpr u64 GetIdentityMapTtbr0(s32 core_id) const { return this->ttbr0_identity[core_id]; }
-
-            void DumpMemoryBlocks() const {
-                return this->page_table.DumpMemoryBlocks();
-            }
-
-            void DumpPageTable() const {
-                return this->page_table.DumpPageTable();
-            }
-
-            size_t CountPageTables() const {
-                return this->page_table.CountPageTables();
-            }
    };

 }
--- a/libraries/libmesosphere/include/mesosphere/board/nintendo/nx/kern_cpu_map.hpp
+++ b/libraries/libmesosphere/include/mesosphere/board/nintendo/nx/kern_cpu_map.hpp
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2018-2020 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>
-
-namespace ams::kern::board::nintendo::nx::impl::cpu {
-
-    /* Virtual to Physical core map. */
-    constexpr inline const s32 VirtualToPhysicalCoreMap[BITSIZEOF(u64)] = {
-        0, 1, 2, 3, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 3,
-    };
-
-}
--- a/libraries/libmesosphere/include/mesosphere/board/nintendo/nx/kern_k_system_control.hpp
+++ b/libraries/libmesosphere/include/mesosphere/board/nintendo/nx/kern_k_system_control.hpp
@@ -30,7 +30,6 @@ namespace ams::kern::board::nintendo::nx {
                    static size_t GetApplicationPoolSize();
                    static size_t GetAppletPoolSize();
                    static size_t GetMinimumNonSecureSystemPoolSize();
-                    static u8 GetDebugLogUartPort();

                    /* Randomness. */
                    static void GenerateRandomBytes(void *dst, size_t size);
--- a/libraries/libmesosphere/include/mesosphere/init/kern_init_slab_setup.hpp
+++ b/libraries/libmesosphere/include/mesosphere/init/kern_init_slab_setup.hpp
@@ -34,8 +34,6 @@ namespace ams::kern::init {
        size_t num_KObjectName;
        size_t num_KResourceLimit;
        size_t num_KDebug;
-        size_t num_KAlpha;
-        size_t num_KBeta;
    };

    NOINLINE void InitializeSlabResourceCounts();
--- a/libraries/libmesosphere/include/mesosphere/kern_build_config.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_build_config.hpp
@@ -26,7 +26,6 @@
 #ifdef  MESOSPHERE_BUILD_FOR_DEBUGGING
 #define MESOSPHERE_ENABLE_ASSERTIONS
 #define MESOSPHERE_ENABLE_DEBUG_PRINT
-#define MESOSPHERE_ENABLE_KERNEL_STACK_USAGE
 #endif

 //#define MESOSPHERE_BUILD_FOR_TRACING
--- a/libraries/libmesosphere/include/mesosphere/kern_debug_log.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_debug_log.hpp
@@ -40,7 +40,7 @@ namespace ams::kern {
 #ifndef MESOSPHERE_DEBUG_LOG_SELECTED

    #ifdef ATMOSPHERE_BOARD_NINTENDO_NX
-        #define MESOSPHERE_DEBUG_LOG_USE_UART
+        #define MESOSPHERE_DEBUG_LOG_USE_UART_A
    #else
        #error "Unknown board for Default Debug Log Source"
    #endif
--- a/libraries/libmesosphere/include/mesosphere/kern_k_alpha.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_alpha.hpp
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2018-2020 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>
-
-namespace ams::kern {
-
-    class KAlpha final : public KAutoObjectWithSlabHeapAndContainer<KAlpha, KAutoObjectWithList> {
-        MESOSPHERE_AUTOOBJECT_TRAITS(KAlpha, KAutoObject);
-        private:
-            /* NOTE: Official KAlpha has size 0x50, corresponding to 0x20 bytes of fields. */
-            /* TODO: Add these fields, if KAlpha is ever instantiable in the NX kernel. */
-        public:
-            explicit KAlpha() {
-                /* ... */
-            }
-
-            virtual ~KAlpha() { /* ... */ }
-
-            /* virtual void Finalize() override; */
-
-            virtual bool IsInitialized() const override { return false /* TODO */; }
-            static void PostDestroy(uintptr_t arg) { MESOSPHERE_UNUSED(arg); /* ... */ }
-    };
-
-}
--- a/libraries/libmesosphere/include/mesosphere/kern_k_auto_object.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_auto_object.hpp
@@ -198,7 +198,7 @@ namespace ams::kern {
                }
            }

-            ~KScopedAutoObject() {
+            ALWAYS_INLINE ~KScopedAutoObject() {
                if (this->obj != nullptr) {
                    this->obj->Close();
                }
@@ -206,7 +206,7 @@ namespace ams::kern {
            }

            template<typename U> requires (std::derived_from<T, U> || std::derived_from<U, T>)
-            constexpr KScopedAutoObject(KScopedAutoObject<U> &&rhs) {
+            constexpr ALWAYS_INLINE KScopedAutoObject(KScopedAutoObject<U> &&rhs) {
                if constexpr (std::derived_from<U, T>) {
                    /* Upcast. */
                    this->obj = rhs.obj;
--- a/libraries/libmesosphere/include/mesosphere/kern_k_beta.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_beta.hpp
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2018-2020 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>
-
-namespace ams::kern {
-
-    class KProcess;
-
-    class KBeta final : public KAutoObjectWithSlabHeapAndContainer<KBeta, KAutoObjectWithList> {
-        MESOSPHERE_AUTOOBJECT_TRAITS(KBeta, KAutoObject);
-        private:
-            friend class KProcess;
-        private:
-            /* NOTE: Official KBeta has size 0x88, corresponding to 0x58 bytes of fields. */
-            /* TODO: Add these fields, if KBeta is ever instantiable in the NX kernel. */
-            util::IntrusiveListNode process_list_node;
-        public:
-            explicit KBeta()
-                : process_list_node()
-            {
-                /* ... */
-            }
-
-            virtual ~KBeta() { /* ... */ }
-
-            /* virtual void Finalize() override; */
-
-            virtual bool IsInitialized() const override { return false /* TODO */; }
-            static void PostDestroy(uintptr_t arg) { MESOSPHERE_UNUSED(arg); /* ... */ }
-    };
-
-}
--- a/libraries/libmesosphere/include/mesosphere/kern_k_class_token.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_class_token.hpp
@@ -112,10 +112,6 @@ namespace ams::kern {
                KSessionRequest,
                KCodeMemory,

-                /* NOTE: True order for these has not been determined yet. */
-                KAlpha,
-                KBeta,
-
                FinalClassesEnd = FinalClassesStart + NumFinalClasses,
            };

--- a/libraries/libmesosphere/include/mesosphere/kern_k_client_port.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_client_port.hpp
@@ -42,10 +42,6 @@ namespace ams::kern {

            constexpr const KPort *GetParent() const { return this->parent; }

-            ALWAYS_INLINE s32 GetNumSessions()  const { return this->num_sessions; }
-            ALWAYS_INLINE s32 GetPeakSessions() const { return this->peak_sessions; }
-            ALWAYS_INLINE s32 GetMaxSessions()  const { return this->max_sessions; }
-
            bool IsLight() const;

            /* Overridden virtual functions. */
--- a/libraries/libmesosphere/include/mesosphere/kern_k_condition_variable.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_condition_variable.hpp
@@ -20,6 +20,8 @@

 namespace ams::kern {

+    extern KThread g_cv_arbiter_compare_thread;
+
    class KConditionVariable {
        public:
            using ThreadTree = typename KThread::ConditionVariableThreadTreeType;
--- a/libraries/libmesosphere/include/mesosphere/kern_k_dump_object.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_dump_object.hpp
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2018-2020 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_select_cpu.hpp>
-
-namespace ams::kern::KDumpObject {
-
-    void DumpThread();
-    void DumpThread(u64 thread_id);
-
-    void DumpThreadCallStack();
-    void DumpThreadCallStack(u64 thread_id);
-
-    void DumpKernelObject();
-
-    void DumpHandle();
-    void DumpHandle(u64 process_id);
-
-    void DumpKernelMemory();
-    void DumpMemory();
-    void DumpMemory(u64 process_id);
-
-    void DumpProcess();
-    void DumpProcess(u64 process_id);
-
-    void DumpPort();
-    void DumpPort(u64 process_id);
-
-}
--- a/libraries/libmesosphere/include/mesosphere/kern_k_handle_table.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_handle_table.hpp
@@ -160,16 +160,14 @@ namespace ams::kern {
                return this->template GetObjectWithoutPseudoHandle<T>(handle);
            }

-            KScopedAutoObject<KAutoObject> GetObjectForIpcWithoutPseudoHandle(ams::svc::Handle handle) const {
+            ALWAYS_INLINE KScopedAutoObject<KAutoObject> GetObjectForIpcWithoutPseudoHandle(ams::svc::Handle handle) const {
                /* Lock and look up in table. */
                KScopedDisableDispatch dd;
                KScopedSpinLock lk(this->lock);

                KAutoObject *obj = this->GetObjectImpl(handle);
-                if (AMS_LIKELY(obj != nullptr)) {
-                    if (AMS_UNLIKELY(obj->DynamicCast<KInterruptEvent *>() != nullptr)) {
-                        return nullptr;
-                    }
+                if (obj->DynamicCast<KInterruptEvent *>() != nullptr) {
+                    return nullptr;
                }

                return obj;
--- a/libraries/libmesosphere/include/mesosphere/kern_k_memory_layout.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_memory_layout.hpp
@@ -112,9 +112,7 @@ namespace ams::kern {
            }

            static ALWAYS_INLINE KVirtualAddress GetStackTopAddress(s32 core_id, KMemoryRegionType type) {
-                const auto &region = Dereference(GetVirtualMemoryRegionTree().FindByTypeAndAttribute(type, static_cast<u32>(core_id)));
-                MESOSPHERE_INIT_ABORT_UNLESS(region.GetEndAddress() != 0);
-                return region.GetEndAddress();
+                return Dereference(GetVirtualMemoryRegionTree().FindByTypeAndAttribute(type, static_cast<u32>(core_id))).GetEndAddress();
            }
        public:
            static ALWAYS_INLINE KMemoryRegionTree &GetVirtualMemoryRegionTree()        { return s_virtual_tree; }
--- a/libraries/libmesosphere/include/mesosphere/kern_k_memory_manager.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_memory_manager.hpp
@@ -70,13 +70,11 @@ namespace ams::kern {
                public:
                    Impl() : heap(), page_reference_counts(), management_region(), pool(), next(), prev() { /* ... */ }

-                    size_t Initialize(uintptr_t address, size_t size, KVirtualAddress management, KVirtualAddress management_end, Pool p);
+                    size_t Initialize(const KMemoryRegion *region, Pool pool, KVirtualAddress management_region, KVirtualAddress management_region_end);

                    KVirtualAddress AllocateBlock(s32 index, bool random) { return this->heap.AllocateBlock(index, random); }
                    void Free(KVirtualAddress addr, size_t num_pages) { this->heap.Free(addr, num_pages); }

-                    void UpdateUsedHeapSize() { this->heap.UpdateUsedSize(); }
-
                    void InitializeOptimizedMemory() { std::memset(GetVoidPointer(this->management_region), 0, CalculateOptimizedProcessOverheadSize(this->heap.GetSize())); }

                    void TrackUnoptimizedAllocation(KVirtualAddress block, size_t num_pages);
@@ -90,8 +88,6 @@ namespace ams::kern {

                    size_t GetFreeSize() const { return this->heap.GetFreeSize(); }

-                    void DumpFreeList() const { return this->heap.DumpFreeList(); }
-
                    constexpr size_t GetPageOffset(KVirtualAddress address)      const { return this->heap.GetPageOffset(address); }
                    constexpr size_t GetPageOffsetToEnd(KVirtualAddress address) const { return this->heap.GetPageOffsetToEnd(address); }

@@ -249,15 +245,12 @@ namespace ams::kern {
            size_t GetFreeSize() {
                size_t total = 0;
                for (size_t i = 0; i < this->num_managers; i++) {
-                    KScopedLightLock lk(this->pool_locks[this->managers[i].GetPool()]);
                    total += this->managers[i].GetFreeSize();
                }
                return total;
            }

            size_t GetFreeSize(Pool pool) {
-                KScopedLightLock lk(this->pool_locks[pool]);
-
                constexpr Direction GetSizeDirection = Direction_FromFront;
                size_t total = 0;
                for (auto *manager = this->GetFirstManager(pool, GetSizeDirection); manager != nullptr; manager = this->GetNextManager(manager, GetSizeDirection)) {
@@ -265,15 +258,6 @@ namespace ams::kern {
                }
                return total;
            }
-
-            void DumpFreeList(Pool pool) {
-                KScopedLightLock lk(this->pool_locks[pool]);
-
-                constexpr Direction DumpDirection = Direction_FromFront;
-                for (auto *manager = this->GetFirstManager(pool, DumpDirection); manager != nullptr; manager = this->GetNextManager(manager, DumpDirection)) {
-                    manager->DumpFreeList();
-                }
-            }
        public:
            static size_t CalculateManagementOverheadSize(size_t region_size) {
                return Impl::CalculateManagementOverheadSize(region_size);
--- a/libraries/libmesosphere/include/mesosphere/kern_k_memory_region.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_memory_region.hpp
@@ -29,7 +29,7 @@ namespace ams::kern {
        private:
            uintptr_t address;
            uintptr_t pair_address;
-            uintptr_t last_address;
+            size_t region_size;
            u32 attributes;
            u32 type_id;
        public:
@@ -43,18 +43,18 @@ namespace ams::kern {
                }
            }
        public:
-            constexpr ALWAYS_INLINE KMemoryRegion() : address(0), pair_address(0), last_address(0), attributes(0), type_id(0) { /* ... */ }
-            constexpr ALWAYS_INLINE KMemoryRegion(uintptr_t a, size_t la, uintptr_t p, u32 r, u32 t) :
-                address(a), pair_address(p), last_address(la), attributes(r), type_id(t)
+            constexpr ALWAYS_INLINE KMemoryRegion() : address(0), pair_address(0), region_size(0), attributes(0), type_id(0) { /* ... */ }
+            constexpr ALWAYS_INLINE KMemoryRegion(uintptr_t a, size_t rs, uintptr_t p, u32 r, u32 t) :
+                address(a), pair_address(p), region_size(rs), attributes(r), type_id(t)
            {
                /* ... */
            }
-            constexpr ALWAYS_INLINE KMemoryRegion(uintptr_t a, size_t la, u32 r, u32 t) : KMemoryRegion(a, la, std::numeric_limits<uintptr_t>::max(), r, t) { /* ... */ }
+            constexpr ALWAYS_INLINE KMemoryRegion(uintptr_t a, size_t rs, u32 r, u32 t) : KMemoryRegion(a, rs, std::numeric_limits<uintptr_t>::max(), r, t) { /* ... */ }
        private:
-            constexpr ALWAYS_INLINE void Reset(uintptr_t a, uintptr_t la, uintptr_t p, u32 r, u32 t) {
+            constexpr ALWAYS_INLINE void Reset(uintptr_t a, uintptr_t rs, uintptr_t p, u32 r, u32 t) {
                this->address      = a;
                this->pair_address = p;
-                this->last_address  = la;
+                this->region_size  = rs;
                this->attributes   = r;
                this->type_id      = t;
            }
@@ -67,16 +67,16 @@ namespace ams::kern {
                return this->pair_address;
            }

-            constexpr ALWAYS_INLINE uintptr_t GetLastAddress() const {
-                return this->last_address;
+            constexpr ALWAYS_INLINE size_t GetSize() const {
+                return this->region_size;
            }

            constexpr ALWAYS_INLINE uintptr_t GetEndAddress() const {
-                return this->GetLastAddress() + 1;
+                return this->GetAddress() + this->GetSize();
            }

-            constexpr ALWAYS_INLINE size_t GetSize() const {
-                return this->GetEndAddress() - this->GetAddress();
+            constexpr ALWAYS_INLINE uintptr_t GetLastAddress() const {
+                return this->GetEndAddress() - 1;
            }

            constexpr ALWAYS_INLINE u32 GetAttributes() const {
@@ -93,7 +93,6 @@ namespace ams::kern {
            }

            constexpr ALWAYS_INLINE bool Contains(uintptr_t address) const {
-                MESOSPHERE_INIT_ABORT_UNLESS(this->GetEndAddress() != 0);
                return this->GetAddress() <= address && address <= this->GetLastAddress();
            }

@@ -131,17 +130,17 @@ namespace ams::kern {
                    return this->first_region->GetAddress();
                }

-                constexpr ALWAYS_INLINE uintptr_t GetLastAddress() const {
-                    return this->last_region->GetLastAddress();
-                }
-
                constexpr ALWAYS_INLINE uintptr_t GetEndAddress() const {
-                    return this->GetLastAddress() + 1;
+                    return this->last_region->GetEndAddress();
                }

                constexpr ALWAYS_INLINE size_t GetSize() const {
                    return this->GetEndAddress() - this->GetAddress();
                }
+
+                constexpr ALWAYS_INLINE uintptr_t GetLastAddress() const {
+                    return this->GetEndAddress() - 1;
+                }
            };
        private:
            using TreeType = util::IntrusiveRedBlackTreeBaseTraits<KMemoryRegion>::TreeType<KMemoryRegion>;
@@ -161,7 +160,7 @@ namespace ams::kern {
            constexpr ALWAYS_INLINE KMemoryRegionTree() : tree() { /* ... */ }
        public:
            KMemoryRegion *FindModifiable(uintptr_t address) {
-                if (auto it = this->find(KMemoryRegion(address, address, 0, 0)); it != this->end()) {
+                if (auto it = this->find(KMemoryRegion(address, 1, 0, 0)); it != this->end()) {
                    return std::addressof(*it);
                } else {
                    return nullptr;
@@ -169,7 +168,7 @@ namespace ams::kern {
            }

            const KMemoryRegion *Find(uintptr_t address) const {
-                if (auto it = this->find(KMemoryRegion(address, address, 0, 0)); it != this->cend()) {
+                if (auto it = this->find(KMemoryRegion(address, 1, 0, 0)); it != this->cend()) {
                    return std::addressof(*it);
                } else {
                    return nullptr;
@@ -235,7 +234,7 @@ namespace ams::kern {
                return extents;
            }
        public:
-            NOINLINE void InsertDirectly(uintptr_t address, uintptr_t last_address, u32 attr = 0, u32 type_id = 0);
+            NOINLINE void InsertDirectly(uintptr_t address, size_t size, u32 attr = 0, u32 type_id = 0);
            NOINLINE bool Insert(uintptr_t address, size_t size, u32 type_id, u32 new_attr = 0, u32 old_attr = 0);

            NOINLINE KVirtualAddress GetRandomAlignedRegion(size_t size, size_t alignment, u32 type_id);
--- a/libraries/libmesosphere/include/mesosphere/kern_k_page_heap.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_page_heap.hpp
@@ -147,7 +147,6 @@ namespace ams::kern {
            }

            size_t GetFreeSize() const { return this->GetNumFreePages() * PageSize; }
-            void DumpFreeList() const;

            void UpdateUsedSize() {
                this->used_size = this->heap_size - (this->GetNumFreePages() * PageSize);
--- a/libraries/libmesosphere/include/mesosphere/kern_k_page_table_base.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_page_table_base.hpp
@@ -301,8 +301,6 @@ namespace ams::kern {
            Result SetupForIpcClient(PageLinkedList *page_list, size_t *out_blocks_needed, KProcessAddress address, size_t size, KMemoryPermission test_perm, KMemoryState dst_state);
            Result SetupForIpcServer(KProcessAddress *out_addr, size_t size, KProcessAddress src_addr, KMemoryPermission test_perm, KMemoryState dst_state, KPageTableBase &src_page_table, bool send);
            void CleanupForIpcClientOnServerSetupFailure(PageLinkedList *page_list, KProcessAddress address, size_t size, KMemoryPermission prot_perm);
-
-            size_t GetSize(KMemoryState state) const;
        public:
            bool GetPhysicalAddress(KPhysicalAddress *out, KProcessAddress virt_addr) const {
                return this->GetImpl().GetPhysicalAddress(out, virt_addr);
@@ -384,9 +382,9 @@ namespace ams::kern {
            Result MapPhysicalMemoryUnsafe(KProcessAddress address, size_t size);
            Result UnmapPhysicalMemoryUnsafe(KProcessAddress address, size_t size);

-            void DumpMemoryBlocksLocked() const {
-                MESOSPHERE_ASSERT(this->IsLockedByCurrentThread());
-                this->memory_block_manager.DumpBlocks();
+            void DumpTable() const {
+                KScopedLightLock lk(this->general_lock);
+                this->GetImpl().Dump(GetInteger(this->address_space_start), this->address_space_end - this->address_space_start);
            }

            void DumpMemoryBlocks() const {
@@ -394,14 +392,9 @@ namespace ams::kern {
                this->DumpMemoryBlocksLocked();
            }

-            void DumpPageTable() const {
-                KScopedLightLock lk(this->general_lock);
-                this->GetImpl().Dump(GetInteger(this->address_space_start), this->address_space_end - this->address_space_start);
-            }
-
-            size_t CountPageTables() const {
-                KScopedLightLock lk(this->general_lock);
-                return this->GetImpl().CountPageTables();
+            void DumpMemoryBlocksLocked() const {
+                MESOSPHERE_ASSERT(this->IsLockedByCurrentThread());
+                this->memory_block_manager.DumpBlocks();
            }
        public:
            KProcessAddress GetAddressSpaceStart()    const { return this->address_space_start; }
@@ -425,11 +418,6 @@ namespace ams::kern {
                return (this->current_heap_end - this->heap_region_start) + this->mapped_physical_memory_size;
            }

-            size_t GetCodeSize() const;
-            size_t GetCodeDataSize() const;
-            size_t GetAliasCodeSize() const;
-            size_t GetAliasCodeDataSize() const;
-
            u32 GetAllocateOption() const { return this->allocate_option; }
        public:
            static ALWAYS_INLINE KVirtualAddress GetLinearMappedVirtualAddress(KPhysicalAddress addr) {
--- a/libraries/libmesosphere/include/mesosphere/kern_k_process.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_process.hpp
@@ -22,7 +22,6 @@
 #include <mesosphere/kern_k_thread.hpp>
 #include <mesosphere/kern_k_thread_local_page.hpp>
 #include <mesosphere/kern_k_shared_memory_info.hpp>
-#include <mesosphere/kern_k_beta.hpp>
 #include <mesosphere/kern_k_worker_task.hpp>
 #include <mesosphere/kern_select_page_table.hpp>
 #include <mesosphere/kern_k_condition_variable.hpp>
@@ -53,7 +52,6 @@ namespace ams::kern {
            static constexpr size_t AslrAlignment = KernelAslrAlignment;
        private:
            using SharedMemoryInfoList = util::IntrusiveListBaseTraits<KSharedMemoryInfo>::ListType;
-            using BetaList = util::IntrusiveListMemberTraits<&KBeta::process_list_node>::ListType;
            using TLPTree = util::IntrusiveRedBlackTreeBaseTraits<KThreadLocalPage>::TreeType<KThreadLocalPage>;
            using TLPIterator = TLPTree::iterator;
        private:
@@ -97,7 +95,6 @@ namespace ams::kern {
            KThread                    *exception_thread{};
            ThreadList                  thread_list{};
            SharedMemoryInfoList        shared_memory_list{};
-            BetaList                    beta_list{};
            bool                        is_suspended{};
            bool                        is_jit_debug{};
            ams::svc::DebugEvent        jit_debug_event_type{};
@@ -170,8 +167,6 @@ namespace ams::kern {

            constexpr KProcessAddress GetEntryPoint() const { return this->code_address; }

-            constexpr size_t GetMainStackSize() const { return this->main_thread_stack_size; }
-
            constexpr KMemoryManager::Pool GetMemoryPool() const { return this->memory_pool; }

            constexpr u64 GetRandomEntropy(size_t i) const { return this->entropy[i]; }
@@ -307,11 +302,6 @@ namespace ams::kern {
                }
            }

-            const KDynamicPageManager &GetDynamicPageManager() const { return this->dynamic_page_manager; }
-            const KMemoryBlockSlabManager &GetMemoryBlockSlabManager() const { return this->memory_block_slab_manager; }
-            const KBlockInfoManager &GetBlockInfoManager() const { return this->block_info_manager; }
-            const KPageTableManager &GetPageTableManager() const { return this->page_table_manager; }
-
            constexpr KThread *GetRunningThread(s32 core) const { return this->running_threads[core]; }
            constexpr u64 GetRunningThreadIdleCount(s32 core) const { return this->running_thread_idle_counts[core]; }

--- a/libraries/libmesosphere/include/mesosphere/kern_k_scheduler_lock.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_scheduler_lock.hpp
@@ -45,7 +45,7 @@ namespace ams::kern {
                return this->owner_thread == GetCurrentThreadPointer();
            }

-            void Lock() {
+            ALWAYS_INLINE void Lock() {
                MESOSPHERE_ASSERT_THIS();

                if (this->IsLockedByCurrentThread()) {
@@ -67,7 +67,7 @@ namespace ams::kern {
                }
            }

-            void Unlock() {
+            ALWAYS_INLINE void Unlock() {
                MESOSPHERE_ASSERT_THIS();
                MESOSPHERE_ASSERT(this->IsLockedByCurrentThread());
                MESOSPHERE_ASSERT(this->lock_count > 0);
--- a/libraries/libmesosphere/include/mesosphere/kern_k_scoped_scheduler_lock_and_sleep.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_scoped_scheduler_lock_and_sleep.hpp
@@ -37,7 +37,7 @@ namespace ams::kern {
                *out_timer = this->timer;
            }

-            ~KScopedSchedulerLockAndSleep() {
+            ALWAYS_INLINE ~KScopedSchedulerLockAndSleep() {
                /* Register the sleep. */
                if (this->timeout_tick > 0) {
                    this->timer->RegisterAbsoluteTask(this->thread, this->timeout_tick);
--- a/libraries/libmesosphere/include/mesosphere/kern_k_server_session.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_server_session.hpp
@@ -50,8 +50,6 @@ namespace ams::kern {
            Result SendReply(uintptr_t message, uintptr_t buffer_size, KPhysicalAddress message_paddr);

            void OnClientClosed();
-
-            void Dump();
        private:
            bool IsSignaledImpl() const;
            void CleanupRequests();
--- a/libraries/libmesosphere/include/mesosphere/kern_k_session.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_session.hpp
@@ -71,8 +71,6 @@ namespace ams::kern {
            KServerSession &GetServerSession() { return this->server; }
            const KClientSession &GetClientSession() const { return this->client; }
            const KServerSession &GetServerSession() const { return this->server; }
-
-            const KClientPort *GetParent() const { return this->port; }
    };

 }
--- a/libraries/libmesosphere/include/mesosphere/kern_k_session_request.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_session_request.hpp
@@ -45,10 +45,10 @@ namespace ams::kern {
                                this->state          = st;
                            }

-                            constexpr ALWAYS_INLINE KProcessAddress GetClientAddress() const { return this->client_address; }
-                            constexpr ALWAYS_INLINE KProcessAddress GetServerAddress() const { return this->server_address; }
-                            constexpr ALWAYS_INLINE size_t GetSize() const { return this->size; }
-                            constexpr ALWAYS_INLINE KMemoryState GetMemoryState() const { return this->state; }
+                            constexpr KProcessAddress GetClientAddress() const { return this->client_address; }
+                            constexpr KProcessAddress GetServerAddress() const { return this->server_address; }
+                            constexpr size_t GetSize() const { return this->size; }
+                            constexpr KMemoryState GetMemoryState() const { return this->state; }
                    };
                private:
                    Mapping static_mappings[NumStaticMappings];
@@ -62,32 +62,32 @@ namespace ams::kern {
                    void Initialize() { /* ... */ }
                    void Finalize();

-                    constexpr ALWAYS_INLINE size_t GetSendCount() const { return this->num_send; }
-                    constexpr ALWAYS_INLINE size_t GetReceiveCount() const { return this->num_recv; }
-                    constexpr ALWAYS_INLINE size_t GetExchangeCount() const { return this->num_exch; }
+                    constexpr size_t GetSendCount() const { return this->num_send; }
+                    constexpr size_t GetReceiveCount() const { return this->num_recv; }
+                    constexpr size_t GetExchangeCount() const { return this->num_exch; }

                    Result PushSend(KProcessAddress client, KProcessAddress server, size_t size, KMemoryState state);
                    Result PushReceive(KProcessAddress client, KProcessAddress server, size_t size, KMemoryState state);
                    Result PushExchange(KProcessAddress client, KProcessAddress server, size_t size, KMemoryState state);

-                    constexpr ALWAYS_INLINE KProcessAddress GetSendClientAddress(size_t i) const { return GetSendMapping(i).GetClientAddress(); }
-                    constexpr ALWAYS_INLINE KProcessAddress GetSendServerAddress(size_t i) const { return GetSendMapping(i).GetServerAddress(); }
-                    constexpr ALWAYS_INLINE size_t          GetSendSize(size_t i)          const { return GetSendMapping(i).GetSize(); }
-                    constexpr ALWAYS_INLINE KMemoryState    GetSendMemoryState(size_t i)   const { return GetSendMapping(i).GetMemoryState(); }
+                    constexpr KProcessAddress GetSendClientAddress(size_t i) const { return GetSendMapping(i).GetClientAddress(); }
+                    constexpr KProcessAddress GetSendServerAddress(size_t i) const { return GetSendMapping(i).GetServerAddress(); }
+                    constexpr size_t          GetSendSize(size_t i)          const { return GetSendMapping(i).GetSize(); }
+                    constexpr KMemoryState    GetSendMemoryState(size_t i)   const { return GetSendMapping(i).GetMemoryState(); }

-                    constexpr ALWAYS_INLINE KProcessAddress GetReceiveClientAddress(size_t i) const { return GetReceiveMapping(i).GetClientAddress(); }
-                    constexpr ALWAYS_INLINE KProcessAddress GetReceiveServerAddress(size_t i) const { return GetReceiveMapping(i).GetServerAddress(); }
-                    constexpr ALWAYS_INLINE size_t          GetReceiveSize(size_t i)          const { return GetReceiveMapping(i).GetSize(); }
-                    constexpr ALWAYS_INLINE KMemoryState    GetReceiveMemoryState(size_t i)   const { return GetReceiveMapping(i).GetMemoryState(); }
+                    constexpr KProcessAddress GetReceiveClientAddress(size_t i) const { return GetReceiveMapping(i).GetClientAddress(); }
+                    constexpr KProcessAddress GetReceiveServerAddress(size_t i) const { return GetReceiveMapping(i).GetServerAddress(); }
+                    constexpr size_t          GetReceiveSize(size_t i)          const { return GetReceiveMapping(i).GetSize(); }
+                    constexpr KMemoryState    GetReceiveMemoryState(size_t i)   const { return GetReceiveMapping(i).GetMemoryState(); }

-                    constexpr ALWAYS_INLINE KProcessAddress GetExchangeClientAddress(size_t i) const { return GetExchangeMapping(i).GetClientAddress(); }
-                    constexpr ALWAYS_INLINE KProcessAddress GetExchangeServerAddress(size_t i) const { return GetExchangeMapping(i).GetServerAddress(); }
-                    constexpr ALWAYS_INLINE size_t          GetExchangeSize(size_t i)          const { return GetExchangeMapping(i).GetSize(); }
-                    constexpr ALWAYS_INLINE KMemoryState    GetExchangeMemoryState(size_t i)   const { return GetExchangeMapping(i).GetMemoryState(); }
+                    constexpr KProcessAddress GetExchangeClientAddress(size_t i) const { return GetExchangeMapping(i).GetClientAddress(); }
+                    constexpr KProcessAddress GetExchangeServerAddress(size_t i) const { return GetExchangeMapping(i).GetServerAddress(); }
+                    constexpr size_t          GetExchangeSize(size_t i)          const { return GetExchangeMapping(i).GetSize(); }
+                    constexpr KMemoryState    GetExchangeMemoryState(size_t i)   const { return GetExchangeMapping(i).GetMemoryState(); }
                private:
                    Result PushMap(KProcessAddress client, KProcessAddress server, size_t size, KMemoryState state, size_t index);

-                    constexpr ALWAYS_INLINE const Mapping &GetSendMapping(size_t i) const {
+                    constexpr const Mapping &GetSendMapping(size_t i) const {
                        MESOSPHERE_ASSERT(i < this->num_send);

                        const size_t index = i;
@@ -98,7 +98,7 @@ namespace ams::kern {
                        }
                    }

-                    constexpr ALWAYS_INLINE const Mapping &GetReceiveMapping(size_t i) const {
+                    constexpr const Mapping &GetReceiveMapping(size_t i) const {
                        MESOSPHERE_ASSERT(i < this->num_recv);

                        const size_t index = this->num_send + i;
@@ -109,7 +109,7 @@ namespace ams::kern {
                        }
                    }

-                    constexpr ALWAYS_INLINE const Mapping &GetExchangeMapping(size_t i) const {
+                    constexpr const Mapping &GetExchangeMapping(size_t i) const {
                        MESOSPHERE_ASSERT(i < this->num_exch);

                        const size_t index = this->num_send + this->num_recv + i;
@@ -176,50 +176,50 @@ namespace ams::kern {

            static void PostDestroy(uintptr_t arg) { MESOSPHERE_UNUSED(arg); /* ... */ }

-            constexpr ALWAYS_INLINE KThread *GetThread() const { return this->thread; }
-            constexpr ALWAYS_INLINE KWritableEvent *GetEvent() const { return this->event; }
-            constexpr ALWAYS_INLINE uintptr_t GetAddress() const { return this->address; }
-            constexpr ALWAYS_INLINE size_t GetSize() const { return this->size; }
-            constexpr ALWAYS_INLINE KProcess *GetServerProcess() const { return this->server; }
+            constexpr KThread *GetThread() const { return this->thread; }
+            constexpr KWritableEvent *GetEvent() const { return this->event; }
+            constexpr uintptr_t GetAddress() const { return this->address; }
+            constexpr size_t GetSize() const { return this->size; }
+            constexpr KProcess *GetServerProcess() const { return this->server; }

-            void ALWAYS_INLINE SetServerProcess(KProcess *process) {
+            void SetServerProcess(KProcess *process) {
                this->server = process;
                this->server->Open();
            }

-            constexpr ALWAYS_INLINE void ClearThread() { this->thread = nullptr; }
-            constexpr ALWAYS_INLINE void ClearEvent()  { this->event  = nullptr; }
+            constexpr void ClearThread() { this->thread = nullptr; }
+            constexpr void ClearEvent()  { this->event  = nullptr; }

-            constexpr ALWAYS_INLINE size_t GetSendCount() const { return this->mappings.GetSendCount(); }
-            constexpr ALWAYS_INLINE size_t GetReceiveCount() const { return this->mappings.GetReceiveCount(); }
-            constexpr ALWAYS_INLINE size_t GetExchangeCount() const { return this->mappings.GetExchangeCount(); }
+            constexpr size_t GetSendCount() const { return this->mappings.GetSendCount(); }
+            constexpr size_t GetReceiveCount() const { return this->mappings.GetReceiveCount(); }
+            constexpr size_t GetExchangeCount() const { return this->mappings.GetExchangeCount(); }

-            ALWAYS_INLINE Result PushSend(KProcessAddress client, KProcessAddress server, size_t size, KMemoryState state) {
+            Result PushSend(KProcessAddress client, KProcessAddress server, size_t size, KMemoryState state) {
                return this->mappings.PushSend(client, server, size, state);
            }

-            ALWAYS_INLINE Result PushReceive(KProcessAddress client, KProcessAddress server, size_t size, KMemoryState state) {
+            Result PushReceive(KProcessAddress client, KProcessAddress server, size_t size, KMemoryState state) {
                return this->mappings.PushReceive(client, server, size, state);
            }

-            ALWAYS_INLINE Result PushExchange(KProcessAddress client, KProcessAddress server, size_t size, KMemoryState state) {
+            Result PushExchange(KProcessAddress client, KProcessAddress server, size_t size, KMemoryState state) {
                return this->mappings.PushExchange(client, server, size, state);
            }

-            constexpr ALWAYS_INLINE KProcessAddress GetSendClientAddress(size_t i) const { return this->mappings.GetSendClientAddress(i); }
-            constexpr ALWAYS_INLINE KProcessAddress GetSendServerAddress(size_t i) const { return this->mappings.GetSendServerAddress(i); }
-            constexpr ALWAYS_INLINE size_t          GetSendSize(size_t i)          const { return this->mappings.GetSendSize(i);          }
-            constexpr ALWAYS_INLINE KMemoryState    GetSendMemoryState(size_t i)   const { return this->mappings.GetSendMemoryState(i);   }
+            constexpr KProcessAddress GetSendClientAddress(size_t i) const { return this->mappings.GetSendClientAddress(i); }
+            constexpr KProcessAddress GetSendServerAddress(size_t i) const { return this->mappings.GetSendServerAddress(i); }
+            constexpr size_t          GetSendSize(size_t i)          const { return this->mappings.GetSendSize(i);          }
+            constexpr KMemoryState    GetSendMemoryState(size_t i)   const { return this->mappings.GetSendMemoryState(i);   }

-            constexpr ALWAYS_INLINE KProcessAddress GetReceiveClientAddress(size_t i) const { return this->mappings.GetReceiveClientAddress(i); }
-            constexpr ALWAYS_INLINE KProcessAddress GetReceiveServerAddress(size_t i) const { return this->mappings.GetReceiveServerAddress(i); }
-            constexpr ALWAYS_INLINE size_t          GetReceiveSize(size_t i)          const { return this->mappings.GetReceiveSize(i);          }
-            constexpr ALWAYS_INLINE KMemoryState    GetReceiveMemoryState(size_t i)   const { return this->mappings.GetReceiveMemoryState(i);   }
+            constexpr KProcessAddress GetReceiveClientAddress(size_t i) const { return this->mappings.GetReceiveClientAddress(i); }
+            constexpr KProcessAddress GetReceiveServerAddress(size_t i) const { return this->mappings.GetReceiveServerAddress(i); }
+            constexpr size_t          GetReceiveSize(size_t i)          const { return this->mappings.GetReceiveSize(i);          }
+            constexpr KMemoryState    GetReceiveMemoryState(size_t i)   const { return this->mappings.GetReceiveMemoryState(i);   }

-            constexpr ALWAYS_INLINE KProcessAddress GetExchangeClientAddress(size_t i) const { return this->mappings.GetExchangeClientAddress(i);  }
-            constexpr ALWAYS_INLINE KProcessAddress GetExchangeServerAddress(size_t i) const { return this->mappings.GetExchangeServerAddress(i);  }
-            constexpr ALWAYS_INLINE size_t          GetExchangeSize(size_t i)          const { return this->mappings.GetExchangeSize(i);           }
-            constexpr ALWAYS_INLINE KMemoryState    GetExchangeMemoryState(size_t i)   const { return this->mappings.GetExchangeMemoryState(i);    }
+            constexpr KProcessAddress GetExchangeClientAddress(size_t i) const { return this->mappings.GetExchangeClientAddress(i);  }
+            constexpr KProcessAddress GetExchangeServerAddress(size_t i) const { return this->mappings.GetExchangeServerAddress(i);  }
+            constexpr size_t          GetExchangeSize(size_t i)          const { return this->mappings.GetExchangeSize(i);           }
+            constexpr KMemoryState    GetExchangeMemoryState(size_t i)   const { return this->mappings.GetExchangeMemoryState(i);    }
    };

 }
--- a/libraries/libmesosphere/include/mesosphere/kern_k_slab_heap.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_slab_heap.hpp
@@ -140,21 +140,7 @@ namespace ams::kern {

                void *obj = this->GetImpl()->Allocate();

-                /* Track the allocated peak. */
-                #if defined(MESOSPHERE_BUILD_FOR_DEBUGGING)
-                if (AMS_LIKELY(obj != nullptr)) {
-                    static_assert(std::atomic_ref<uintptr_t>::is_always_lock_free);
-                    std::atomic_ref<uintptr_t> peak_ref(this->peak);
-
-                    const uintptr_t alloc_peak = reinterpret_cast<uintptr_t>(obj) + this->GetObjectSize();
-                    uintptr_t cur_peak = this->peak;
-                    do {
-                        if (alloc_peak <= cur_peak) {
-                            break;
-                        }
-                    } while (!peak_ref.compare_exchange_strong(cur_peak, alloc_peak));
-                }
-                #endif
+                /* TODO: under some debug define, track the peak for statistics, as N does? */

                return obj;
            }
@@ -179,29 +165,6 @@ namespace ams::kern {
            uintptr_t GetSlabHeapAddress() const {
                return this->start;
            }
-
-            size_t GetNumRemaining() const {
-                size_t remaining = 0;
-
-                /* Only calculate the number of remaining objects under debug configuration. */
-                #if defined(MESOSPHERE_BUILD_FOR_DEBUGGING)
-                while (true) {
-                    auto *cur = this->GetImpl()->GetHead();
-                    remaining = 0;
-
-                    while (this->Contains(reinterpret_cast<uintptr_t>(cur))) {
-                        ++remaining;
-                        cur = cur->next;
-                    }
-
-                    if (cur == nullptr) {
-                        break;
-                    }
-                }
-                #endif
-
-                return remaining;
-            }
    };

    template<typename T>
--- a/libraries/libmesosphere/include/mesosphere/kern_k_synchronization_object.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_synchronization_object.hpp
@@ -30,10 +30,9 @@ namespace ams::kern {
                KThread *thread;
            };
        private:
-            ThreadListNode *thread_list_head;
-            ThreadListNode *thread_list_tail;
+            ThreadListNode *thread_list_root;
        protected:
-            constexpr ALWAYS_INLINE explicit KSynchronizationObject() : KAutoObjectWithList(), thread_list_head(), thread_list_tail() { MESOSPHERE_ASSERT_THIS(); }
+            constexpr ALWAYS_INLINE explicit KSynchronizationObject() : KAutoObjectWithList(), thread_list_root() { MESOSPHERE_ASSERT_THIS(); }
            virtual ~KSynchronizationObject() { MESOSPHERE_ASSERT_THIS(); }

            virtual void OnFinalizeSynchronizationObject() { MESOSPHERE_ASSERT_THIS(); }
@@ -47,7 +46,7 @@ namespace ams::kern {
        public:
            virtual void Finalize() override;
            virtual bool IsSignaled() const = 0;
-            virtual void DumpWaiters();
+            virtual void DebugWaiters();
    };

 }
--- a/libraries/libmesosphere/include/mesosphere/kern_k_thread.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_k_thread.hpp
@@ -49,11 +49,11 @@ namespace ams::kern {
            };

            enum SuspendType : u32 {
-                SuspendType_Process   = 0,
-                SuspendType_Thread    = 1,
-                SuspendType_Debug     = 2,
-                SuspendType_Backtrace = 3,
-                SuspendType_Init      = 4,
+                SuspendType_Process = 0,
+                SuspendType_Thread  = 1,
+                SuspendType_Debug   = 2,
+                SuspendType_Unk3    = 3,
+                SuspendType_Init    = 4,

                SuspendType_Count,
            };
@@ -67,13 +67,13 @@ namespace ams::kern {
                ThreadState_SuspendShift = 4,
                ThreadState_Mask         = (1 << ThreadState_SuspendShift) - 1,

-                ThreadState_ProcessSuspended   = (1 << (SuspendType_Process   + ThreadState_SuspendShift)),
-                ThreadState_ThreadSuspended    = (1 << (SuspendType_Thread    + ThreadState_SuspendShift)),
-                ThreadState_DebugSuspended     = (1 << (SuspendType_Debug     + ThreadState_SuspendShift)),
-                ThreadState_BacktraceSuspended = (1 << (SuspendType_Backtrace + ThreadState_SuspendShift)),
-                ThreadState_InitSuspended      = (1 << (SuspendType_Init      + ThreadState_SuspendShift)),
+                ThreadState_ProcessSuspended = (1 << (SuspendType_Process + ThreadState_SuspendShift)),
+                ThreadState_ThreadSuspended  = (1 << (SuspendType_Thread  + ThreadState_SuspendShift)),
+                ThreadState_DebugSuspended   = (1 << (SuspendType_Debug   + ThreadState_SuspendShift)),
+                ThreadState_Unk3Suspended    = (1 << (SuspendType_Unk3    + ThreadState_SuspendShift)),
+                ThreadState_InitSuspended    = (1 << (SuspendType_Init    + ThreadState_SuspendShift)),

-                ThreadState_SuspendFlagMask    = ((1 << SuspendType_Count) - 1) << ThreadState_SuspendShift,
+                ThreadState_SuspendFlagMask  = ((1 << SuspendType_Count) - 1) << ThreadState_SuspendShift,
            };

            enum DpcFlag : u32 {
@@ -124,21 +124,7 @@ namespace ams::kern {
            static_assert(sizeof(SyncObjectBuffer::sync_objects) == sizeof(SyncObjectBuffer::handles));

            struct ConditionVariableComparator {
-                struct LightCompareType {
-                    uintptr_t cv_key;
-                    s32 priority;
-
-                    constexpr ALWAYS_INLINE uintptr_t GetConditionVariableKey() const {
-                        return this->cv_key;
-                    }
-
-                    constexpr ALWAYS_INLINE s32 GetPriority() const {
-                        return this->priority;
-                    }
-                };
-
-                template<typename T> requires (std::same_as<T, KThread> || std::same_as<T, LightCompareType>)
-                static constexpr ALWAYS_INLINE int Compare(const T &lhs, const KThread &rhs) {
+                static constexpr ALWAYS_INLINE int Compare(const KThread &lhs, const KThread &rhs) {
                    const uintptr_t l_key = lhs.GetConditionVariableKey();
                    const uintptr_t r_key = rhs.GetConditionVariableKey();

@@ -153,8 +139,6 @@ namespace ams::kern {
                    }
                }
            };
-            static_assert(ams::util::HasLightCompareType<ConditionVariableComparator>);
-            static_assert(std::same_as<ams::util::LightCompareType<ConditionVariableComparator, void>, ConditionVariableComparator::LightCompareType>);
        private:
            static inline std::atomic<u64> s_next_thread_id = 0;
        private:
@@ -168,8 +152,7 @@ namespace ams::kern {

            ConditionVariableThreadTree    *condvar_tree{};
            uintptr_t                       condvar_key{};
-            u64                             virtual_affinity_mask{};
-            KAffinityMask                   physical_affinity_mask{};
+            KAffinityMask                   affinity_mask{};
            u64                             thread_id{};
            std::atomic<s64>                cpu_time{};
            KSynchronizationObject         *synced_object{};
@@ -198,13 +181,12 @@ namespace ams::kern {
            Result                          wait_result;
            Result                          debug_exception_result;
            s32                             base_priority{};
-            s32                             physical_ideal_core_id{};
-            s32                             virtual_ideal_core_id{};
+            s32                             ideal_core_id{};
            s32                             num_kernel_waiters{};
            s32                             current_core_id{};
            s32                             core_id{};
-            KAffinityMask                   original_physical_affinity_mask{};
-            s32                             original_physical_ideal_core_id{};
+            KAffinityMask                   original_affinity_mask{};
+            s32                             original_ideal_core_id{};
            s32                             num_core_migration_disables{};
            ThreadState                     thread_state{};
            std::atomic<bool>               termination_requested{};
@@ -220,21 +202,21 @@ namespace ams::kern {

            virtual ~KThread() { /* ... */ }

-            Result Initialize(KThreadFunction func, uintptr_t arg, void *kern_stack_top, KProcessAddress user_stack_top, s32 prio, s32 virt_core, KProcess *owner, ThreadType type);
+            Result Initialize(KThreadFunction func, uintptr_t arg, void *kern_stack_top, KProcessAddress user_stack_top, s32 prio, s32 core, KProcess *owner, ThreadType type);

        private:
-            static Result InitializeThread(KThread *thread, KThreadFunction func, uintptr_t arg, KProcessAddress user_stack_top, s32 prio, s32 virt_core, KProcess *owner, ThreadType type);
+            static Result InitializeThread(KThread *thread, KThreadFunction func, uintptr_t arg, KProcessAddress user_stack_top, s32 prio, s32 core, KProcess *owner, ThreadType type);
        public:
-            static Result InitializeKernelThread(KThread *thread, KThreadFunction func, uintptr_t arg, s32 prio, s32 virt_core) {
-                return InitializeThread(thread, func, arg, Null<KProcessAddress>, prio, virt_core, nullptr, ThreadType_Kernel);
+            static Result InitializeKernelThread(KThread *thread, KThreadFunction func, uintptr_t arg, s32 prio, s32 core) {
+                return InitializeThread(thread, func, arg, Null<KProcessAddress>, prio, core, nullptr, ThreadType_Kernel);
            }

            static Result InitializeHighPriorityThread(KThread *thread, KThreadFunction func, uintptr_t arg) {
                return InitializeThread(thread, func, arg, Null<KProcessAddress>, 0, GetCurrentCoreId(), nullptr, ThreadType_HighPriority);
            }

-            static Result InitializeUserThread(KThread *thread, KThreadFunction func, uintptr_t arg, KProcessAddress user_stack_top, s32 prio, s32 virt_core, KProcess *owner) {
-                return InitializeThread(thread, func, arg, user_stack_top, prio, virt_core, owner, ThreadType_User);
+            static Result InitializeUserThread(KThread *thread, KThreadFunction func, uintptr_t arg, KProcessAddress user_stack_top, s32 prio, s32 core, KProcess *owner) {
+                return InitializeThread(thread, func, arg, user_stack_top, prio, core, owner, ThreadType_User);
            }

            static void ResumeThreadsSuspendedForInit();
@@ -341,14 +323,10 @@ namespace ams::kern {
            constexpr KThreadContext &GetContext() { return this->thread_context; }
            constexpr const KThreadContext &GetContext() const { return this->thread_context; }

-            constexpr u64 GetVirtualAffinityMask() const { return this->virtual_affinity_mask; }
-            constexpr const KAffinityMask &GetAffinityMask() const { return this->physical_affinity_mask; }
-
+            constexpr const KAffinityMask &GetAffinityMask() const { return this->affinity_mask; }
            Result GetCoreMask(int32_t *out_ideal_core, u64 *out_affinity_mask);
            Result SetCoreMask(int32_t ideal_core, u64 affinity_mask);

-            Result GetPhysicalCoreMask(int32_t *out_ideal_core, u64 *out_affinity_mask);
-
            constexpr ThreadState GetState() const { return static_cast<ThreadState>(this->thread_state & ThreadState_Mask); }
            constexpr ThreadState GetRawState() const { return this->thread_state; }
            NOINLINE void SetState(ThreadState state);
@@ -358,6 +336,11 @@ namespace ams::kern {
            constexpr uintptr_t GetConditionVariableKey() const { return this->condvar_key; }
            constexpr uintptr_t GetAddressArbiterKey() const { return this->condvar_key; }

+            constexpr void SetupForConditionVariableCompare(uintptr_t cv_key, int priority) {
+                this->condvar_key = cv_key;
+                this->priority    = priority;
+            }
+
            constexpr void SetConditionVariable(ConditionVariableThreadTree *tree, KProcessAddress address, uintptr_t cv_key, u32 value) {
                this->condvar_tree      = tree;
                this->condvar_key       = cv_key;
@@ -373,6 +356,11 @@ namespace ams::kern {
                return this->condvar_tree != nullptr;
            }

+            constexpr void SetupForAddressArbiterCompare(uintptr_t address, int priority) {
+                this->condvar_key = address;
+                this->priority    = priority;
+            }
+
            constexpr void SetAddressArbiter(ConditionVariableThreadTree *tree, uintptr_t address) {
                this->condvar_tree = tree;
                this->condvar_key  = address;
@@ -386,9 +374,7 @@ namespace ams::kern {
                return this->condvar_tree != nullptr;
            }

-            constexpr s32 GetIdealVirtualCore() const { return this->virtual_ideal_core_id; }
-            constexpr s32 GetIdealPhysicalCore() const { return this->physical_ideal_core_id; }
-
+            constexpr s32 GetIdealCore() const { return this->ideal_core_id; }
            constexpr s32 GetActiveCore() const { return this->core_id; }
            constexpr void SetActiveCore(s32 core) { this->core_id = core; }

@@ -533,7 +519,6 @@ namespace ams::kern {
                return this->termination_requested || this->GetRawState() == ThreadState_Terminated;
            }

-            size_t GetKernelStackUsage() const;
        public:
            /* Overridden parent functions. */
            virtual u64 GetId() const override final { return this->GetThreadId(); }
--- a/libraries/libmesosphere/include/mesosphere/kern_select_cpu.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_select_cpu.hpp
@@ -28,24 +28,3 @@
 #else
    #error "Unknown architecture for CPU"
 #endif
-
-#ifdef ATMOSPHERE_BOARD_NINTENDO_NX
-
-    #include <mesosphere/board/nintendo/nx/kern_cpu_map.hpp>
-
-    namespace ams::kern::cpu {
-
-        using namespace ams::kern::board::nintendo::nx::impl::cpu;
-
-    }
-
-#else
-    #error "Unknown board for CPU Map"
-#endif
-
-namespace ams::kern {
-
-    static_assert(cpu::NumCores <= static_cast<s32>(BITSIZEOF(u64)));
-    static_assert(util::size(cpu::VirtualToPhysicalCoreMap) == BITSIZEOF(u64));
-
-}
--- a/libraries/libmesosphere/include/mesosphere/kern_select_interrupt_manager.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_select_interrupt_manager.hpp
@@ -42,7 +42,7 @@ namespace ams::kern {
            u32 prev_intr_state;
        public:
            ALWAYS_INLINE KScopedInterruptDisable() : prev_intr_state(KInterruptManager::DisableInterrupts()) { /* ... */ }
-            ALWAYS_INLINE ~KScopedInterruptDisable() { KInterruptManager::RestoreInterrupts(prev_intr_state); }
+            ~KScopedInterruptDisable() { KInterruptManager::RestoreInterrupts(prev_intr_state); }
    };

    class KScopedInterruptEnable {
@@ -52,7 +52,7 @@ namespace ams::kern {
            u32 prev_intr_state;
        public:
            ALWAYS_INLINE KScopedInterruptEnable() : prev_intr_state(KInterruptManager::EnableInterrupts()) { /* ... */ }
-            ALWAYS_INLINE ~KScopedInterruptEnable() { KInterruptManager::RestoreInterrupts(prev_intr_state); }
+            ~KScopedInterruptEnable() { KInterruptManager::RestoreInterrupts(prev_intr_state); }
    };

 }
--- a/libraries/libmesosphere/include/mesosphere/kern_slab_helpers.hpp
+++ b/libraries/libmesosphere/include/mesosphere/kern_slab_helpers.hpp
@@ -48,8 +48,6 @@ namespace ams::kern {
            static size_t GetSlabHeapSize() { return s_slab_heap.GetSlabHeapSize(); }
            static size_t GetPeakIndex() { return s_slab_heap.GetPeakIndex(); }
            static uintptr_t GetSlabHeapAddress() { return s_slab_heap.GetSlabHeapAddress(); }
-
-            static size_t GetNumRemaining() { return s_slab_heap.GetNumRemaining(); }
    };

    template<typename Derived, typename Base>
@@ -94,7 +92,7 @@ namespace ams::kern {
            virtual uintptr_t GetPostDestroyArgument() const { return 0; }

            size_t GetSlabIndex() const {
-                return s_slab_heap.GetObjectIndex(static_cast<const Derived *>(this));
+                return s_slab_heap.GetIndex(static_cast<const Derived *>(this));
            }
        public:
            static void InitializeSlabHeap(void *memory, size_t memory_size) {
@@ -118,8 +116,6 @@ namespace ams::kern {
            static size_t GetSlabHeapSize() { return s_slab_heap.GetSlabHeapSize(); }
            static size_t GetPeakIndex() { return s_slab_heap.GetPeakIndex(); }
            static uintptr_t GetSlabHeapAddress() { return s_slab_heap.GetSlabHeapAddress(); }
-
-            static size_t GetNumRemaining() { return s_slab_heap.GetNumRemaining(); }
    };

 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Adubbz	3b18db914c	daybreak: update for hid refactor (#1222 )	2020-12-02 02:21:05 -08:00
fincs	b69bf07d9c	reboot_to_payload: Update for new libnx HID interface	2020-12-02 00:51:02 +01:00
fincs	09978eafb9	strat/cfg: Update for new libnx HID interface	2020-12-02 00:50:14 +01:00
fincs	8070de693d	strat/hid: Update for new libnx HID interface	2020-12-02 00:42:13 +01:00
Michael Scire	72671d39ab	kern: cleanup KThread, optimize/normalize KThreadQueue/KWaitObject	2020-12-01 15:19:29 -08:00
Michael Scire	a4c4cf22c9	kern: improve KSynchronizationObject, kill KSynchronization	2020-12-01 14:58:35 -08:00
Michael Scire	6ea1955e94	kern: update for new interrupt event locking scheme	2020-12-01 14:17:25 -08:00
Michael Scire	e81025af2e	kern: fix sleep save/resume for new x18/tpidr scheme	2020-12-01 14:09:09 -08:00
Michael Scire	791638e6ba	kern: fix race-crash on interrupt controller save, improve fatal output	2020-12-01 13:56:01 -08:00
Michael Scire	2e0378c724	kern: KObjectContainer::Register -> void	2020-12-01 13:49:30 -08:00
Michael Scire	59ada14680	kern: Kill KCoreLocalRegion	2020-12-01 13:41:37 -08:00
Michael Scire	25e944f519	kern: remove more of clc	2020-12-01 13:08:47 -08:00
Michael Scire	3e87b8ff17	kern: move scheduler/interrupt task manager out of core local region	2020-12-01 13:03:44 -08:00
Michael Scire	55502fcd0c	kern: update KHardwareTimer, move out of KCoreLocalRegion	2020-12-01 07:47:29 -08:00
Michael Scire	d3e3292bb8	kern: use single interrupt manager object	2020-12-01 07:35:43 -08:00
Michael Scire	33c568963d	kern: fix unnecessary align-down	2020-12-01 07:22:05 -08:00
Michael Scire	c374f1c5ce	kern: fix error in SeparatePages	2020-12-01 07:19:03 -08:00
Michael Scire	825e2df2e0	kern: fix re-order/assert in KMemoryBlock	2020-12-01 06:55:50 -08:00
Michael Scire	b3efdebeaf	kern: remove KPageTableBase::MakeAndOpenContiguousPageGroup	2020-12-01 06:54:53 -08:00
Michael Scire	b393f8f348	kern: implement DisableDeviceAddressSpaceMerge	2020-12-01 06:53:22 -08:00
Michael Scire	74e0ea1033	kern: SvcGetResourceLimitPeakValue	2020-12-01 06:07:18 -08:00
Michael Scire	1738a308c4	kern: KMemoryManager::Allocate -> AllocateAndOpen	2020-12-01 06:01:44 -08:00
Michael Scire	8fe7373ad2	kern: implement kmemoryblock/kmemoryinfo merge disable	2020-12-01 04:57:09 -08:00
Michael Scire	83dd25b894	kern: remove KMemoryAttribute_AnyLocked	2020-12-01 04:33:46 -08:00
Michael Scire	5217a78637	kern: update KMemoryBlockManagerUpdateAllocator api	2020-12-01 04:25:05 -08:00
Michael Scire	2f0470ff1c	kern: implement new software-reserved page table bits	2020-12-01 04:14:58 -08:00
Michael Scire	e6733fb2d4	kern: update KPageTableBase for new disable-merge attrs	2020-12-01 03:33:46 -08:00
Michael Scire	5be5be9e5c	fusee: recognize/support 11.x kernel	2020-12-01 03:28:23 -08:00
Michael Scire	f86d23cb2c	nogc: update for new lafw	2020-12-01 00:58:21 -08:00
Michael Scire	a7bc540fed	fusee: whoops	2020-11-30 23:34:37 -08:00
Michael Scire	0f7853417a	fusee: fix 11.x pk21 support	2020-11-30 23:31:58 -08:00
Michael Scire	11f90f03d9	fusee-secondary: update for 11.0.0 erista	2020-11-30 22:49:30 -08:00
Michael Scire	7e2449b347	erpt: lightly update (TODO: use context, do new svc stuff)	2020-11-30 22:41:16 -08:00
Michael Scire	abe57ac5b2	sm: implement UserService::DetachClient	2020-11-30 22:18:18 -08:00
Michael Scire	8d458b44d7	loader: update for 11.0.0 (anti-dg + set program args abi)	2020-11-30 22:06:52 -08:00
Michael Scire	1352690ece	pgl: update for 11.0.0	2020-11-30 21:47:18 -08:00
Michael Scire	ac6fc7b965	fs: nogc patches for 11.0.0	2020-11-30 21:34:06 -08:00
Michael Scire	d0e6fdb3da	emummc: untested 11.0.0 support	2020-11-30 21:28:12 -08:00
Michael Scire	4c581d21f6	kldr: update for 11.0.0	2020-11-30 20:47:00 -08:00
Michael Scire	1365814b8d	exo: update for 11.0.0	2020-11-30 20:18:25 -08:00
Michael Scire	f63d79d8f9	result: update for accurate ::Includes	2020-11-30 17:16:00 -08:00
Michael Scire	14d50c0e39	erpt: add update autogenerated ids	2020-11-30 16:09:31 -08:00