README.md

@@ -4,7 +4,6 @@
 
 ![License](https://img.shields.io/badge/License-GPLv2-blue.svg)
 [![Chat on Discord](https://img.shields.io/badge/Discord-5865f2?logo=discord&logoColor=white)](https://discordapp.com/invite/ZdqEhed)
-![Made with Notepad++](img/np++.png?raw=true)
 
 Atmosphère is a work-in-progress customized firmware for the Nintendo Switch.
 
@@ -14,6 +13,7 @@ Components
 Atmosphère consists of multiple components, each of which replaces/modifies a different component of the system:
 
 * Fusée: First-stage Loader, responsible for loading and validating stage 2 (custom TrustZone) plus package2 (Kernel/FIRM sysmodules), and patching them as needed. This replaces all functionality normally in Package1loader/NX Bootloader.
+    * Sept: Payload used to enable support for runtime key derivation on 7.0.0.
 * Exosphère: Customized TrustZone, to run a customized Secure Monitor
 * Thermosphère: EL2 EmuNAND support, i.e. backing up and using virtualized/redirected NAND images
 * Stratosphère: Custom Sysmodule(s), both Rosalina style to extend the kernel/provide new features, and of the loader reimplementation style to hook important system actions

atmosphere.mk

@@ -50,7 +50,6 @@ dist: dist-no-debug
 	cp $(CURRENT_DIRECTORY)/stratosphere/sm/$(ATMOSPHERE_OUT_DIR)/sm.elf $(DIST_DIR)/sm.elf
 	cp $(CURRENT_DIRECTORY)/stratosphere/spl/$(ATMOSPHERE_OUT_DIR)/spl.elf $(DIST_DIR)/spl.elf
 	cp $(CURRENT_DIRECTORY)/stratosphere/TioServer/$(ATMOSPHERE_OUT_DIR)/TioServer.elf $(DIST_DIR)/TioServer.elf
-	cp $(CURRENT_DIRECTORY)/stratosphere/memlet/$(ATMOSPHERE_OUT_DIR)/memlet.elf $(DIST_DIR)/memlet.elf
 	cp $(CURRENT_DIRECTORY)/troposphere/daybreak/daybreak.elf $(DIST_DIR)/daybreak.elf
 	cp $(CURRENT_DIRECTORY)/troposphere/haze/haze.elf $(DIST_DIR)/haze.elf
 	cp $(CURRENT_DIRECTORY)/troposphere/reboot_to_payload/reboot_to_payload.elf $(DIST_DIR)/reboot_to_payload.elf
@@ -88,7 +87,6 @@ dist-no-debug: package3 $(CURRENT_DIRECTORY)/$(ATMOSPHERE_OUT_DIR)
 	#mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000003c
 	mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000042
 	mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000420
-	mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000421
 	mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000b240
 	mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000d609
 	mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000d623
@@ -106,8 +104,7 @@ dist-no-debug: package3 $(CURRENT_DIRECTORY)/$(ATMOSPHERE_OUT_DIR)
 	cp stratosphere/htc/$(ATMOSPHERE_OUT_DIR)/htc.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000b240/exefs.nsp
 	cp stratosphere/dmnt.gen2/$(ATMOSPHERE_OUT_DIR)/dmnt.gen2.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000d609/exefs.nsp
 	cp stratosphere/TioServer/$(ATMOSPHERE_OUT_DIR)/TioServer.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000d623/exefs.nsp
-	cp stratosphere/memlet/$(ATMOSPHERE_OUT_DIR)/memlet.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000421/exefs.nsp
-	@PATH="$(DEVKITPRO)/tools/bin:$$PATH" build_romfs $(DIST_DIR)/stratosphere_romfs $(DIST_DIR)/atmosphere/stratosphere.romfs
+	@build_romfs $(DIST_DIR)/stratosphere_romfs $(DIST_DIR)/atmosphere/stratosphere.romfs
 	rm -r $(DIST_DIR)/stratosphere_romfs
 	cp troposphere/reboot_to_payload/reboot_to_payload.nro $(DIST_DIR)/switch/reboot_to_payload.nro
 	cp troposphere/daybreak/daybreak.nro $(DIST_DIR)/switch/daybreak.nro
@@ -117,7 +114,7 @@ dist-no-debug: package3 $(CURRENT_DIRECTORY)/$(ATMOSPHERE_OUT_DIR)
 	cp fusee/$(ATMOSPHERE_BOOT_OUT_DIR)/fusee.bin $(CURRENT_DIRECTORY)/$(ATMOSPHERE_OUT_DIR)/fusee.bin
 
 package3: emummc fusee stratosphere mesosphere exosphere troposphere
-	$(SILENTCMD)$(PYTHON) fusee/build_package3.py $(CURRENT_DIRECTORY) $(ATMOSPHERE_OUT_DIR) $(ATMOSPHERE_BOOT_OUT_DIR) $(ATMOSPHERE_GIT_HASH) $(ATMOSPHERE_MAJOR_VERSION) $(ATMOSPHERE_MINOR_VERSION) $(ATMOSPHERE_MICRO_VERSION) 0 $(ATMOSPHERE_SUPPORTED_HOS_MAJOR_VERSION) $(ATMOSPHERE_SUPPORTED_HOS_MINOR_VERSION) $(ATMOSPHERE_SUPPORTED_HOS_MICRO_VERSION) 0
+	@python fusee/build_package3.py $(CURRENT_DIRECTORY) $(ATMOSPHERE_OUT_DIR) $(ATMOSPHERE_BOOT_OUT_DIR) $(ATMOSPHERE_GIT_HASH) $(ATMOSPHERE_MAJOR_VERSION) $(ATMOSPHERE_MINOR_VERSION) $(ATMOSPHERE_MICRO_VERSION) 0 $(ATMOSPHERE_SUPPORTED_HOS_MAJOR_VERSION) $(ATMOSPHERE_SUPPORTED_HOS_MINOR_VERSION) $(ATMOSPHERE_SUPPORTED_HOS_MICRO_VERSION) 0
 	@echo "Built package3!"
 
 emummc:

docs/changelog.md

@@ -1,74 +1,4 @@
 # Changelog
-## 1.10.0
-+ Basic support was added for 21.0.0.
-  + The console should boot and atmosphère should be fully functional.
-  + **Please note**: All homebrew software may need to be re-compiled with the latest libnx (>= 4.10.0), or else it may crash/experience memory corruption.
-    + Nintendo broke the userland<->kernel TLS ABI in 21.0.0, by writing to previously reserved space.
-    + Homebrew used this reserved space for its TLS slots, which means any homebrew software using TLS slots will experience memory corruption when running under Atmosphere 1.10.0.
-    + This doesn't appear to impact everything, but a large portion of tested homebrew crashes (often on exit), and so will need re-compile for the new ABI.
-      + For those technically inclined, while TLS slots are rarely used by developers, they're used to implement features like e.g. C++ exceptions under the hood, and so anything using those crashes, etc.
-    + To help make this transition easier, hbmenu now shows a warning when selecting homebrew compiled with an older, incompatible ABI version.
-      + I apologize for the hassle in general.
-      + libnx has been updated so that its reserved space matches Nintendo's now -- this particular issue can never occur again, even if Nintendo touches more reserved space.
-  + `exosphère` was updated to reflect the latest official secure monitor behavior.
-  + `mesosphère` was updated to reflect the latest official kernel behavior.
-  + `loader` was updated to reflect the latest official behavior.
-  + `pm` was updated to reflect the latest official behavior.
-  + `erpt` was updated to reflect the latest official behavior.
-  + `pgl` was updated to reflect the latest official behavior.
-  + `fatal` was updated to reflect the latest official behavior.
-+ Support was added for launching another game-which-has-too-many-files with romfs mods.
-  + I rely on user reports for adding support/fixing these, and some of these games can be pretty obscure!
-  + If you are affected by this, you will see "Data abort (0x101)" when trying to launch the game with mods.
-  + Please reach out to `sciresm` on discord if this occurs to share your error report binary.
-    + Although some games may be impossible to fix, I believe I can get almost everything working, so please let me try to help you (and improve atmosphère's support!) if you run into this!
-+ General system stability improvements to enhance the user's experience.
-## 1.9.5
-+ Basic support was added for 20.5.0.
-+ General system stability improvements to enhance the user's experience.
-## 1.9.4
-+ Basic support was added for 20.4.0.
-+ An issue was fixed in `exosphère`'s register accessilibity tables (thanks @CTCaer).
-  + I believe this had no impact on official code, though it would have prevented some homebrew from interacting correctly with the MC0/MC1 registers.
-+ An issue was fixed that could cause a deadlock when building multiple romfs images simultaneously (thanks @Ereza).
-  + This fixes support for certain mods, e.g. system language translations overriding content for both overlayDisp and qlaunch.
-+ General system stability improvements to enhance the user's experience.
-## 1.9.3
-+ Basic support was added for 20.3.0.
-+ Compatibility was fixed for loading mods with KOTOR 2 (star wars).
-+ General system stability improvements to enhance the user's experience.
-## 1.9.2
-+ Basic support was added for 20.2.0.
-+ USB 3.0 support force-enable was fixed for 20.1.0+.
-+ General system stability improvements to enhance the user's experience.
-## 1.9.1
-+ Basic support was added for 20.1.0.
-+ General system stability improvements to enhance the user's experience.
-## 1.9.0
-+ Basic support was added for 20.0.0.
-  + The console should boot and atmosphère should be fully functional. However, not all modules have been fully updated to reflect the latest changes.
-    + There shouldn't be anything user visible resulting from this, but it will be addressed in a future atmosphère update.
-    + The same action item from 18.0.0 remains, and I believe in my heart of hearts that it will be addressed eventually. Someone has told me they're working on it.
-    + There aren't (to my knowledge) outstanding 19.0.0 items any more.
-  + **Please note**: As a result of changes made to nintendo's software in 20.0.0, there is roughly 10MB less memory available for custom system modules.
-    + We can only steal a maximum of 14MB from the applet pool, down from 40MB.
-    + To compensate for this, `ams.mitm`'s heap usage has been reduced by 20MB.
-      + To facilitate this, a new helper module (`memlet`) was added, so that memory may be temporarily stolen during the romfs building process.
-      + Hopefully, this results in relatively little breakage, however it is possible that user mods which replace extremely large numbers of files in The Legend of Zelda: Tears of the Kingdom may no longer function.
-        + If you are affected by this, you will see "Data abort (0x101)" when trying to launch the game with mods.
-        + Please reach out to `sciresm` on discord if this occurs to share your error report binary. However, some issues may be impossible to fix.
-        + I apologize sincerely if the issue is impossible to resolve, but I have been forced unavoidably to make compromises here, and I think this is the best balance to be struck.
-  + `exosphère` was updated to reflect the latest official secure monitor behavior.
-  + `mesosphère` was updated to reflect the latest official kernel behavior.
-  + `loader` was updated to reflect the latest official behavior.
-  + `pm` was updated to reflect the latest official behavior.
-  + `ncm` was partially updated to reflect the latest official behavior.
-  + `erpt` was updated to reflect the latest official behavior.
-+ Atmosphère was updated to use GCC 15/newlib (latest devkitA64/devkitARM releases).
-+ A number of improvements were made to the dmnt cheat engine.
-  + New instructions were added, and instructions were updated for improved/new functionality.
-  + Please see the documents for details -- thanks @tomvita!
-+ General system stability improvements to enhance the user's experience.
 ## 1.8.0
 + Basic support was added for 19.0.0.
   + The console should boot and atmosphère should be fully functional. However, not all modules have been fully updated to reflect the latest changes.

docs/features/cheats.md

@@ -49,7 +49,7 @@ Code type 0x0 allows writing a static value to a memory address.
 `0TMR00AA AAAAAAAA VVVVVVVV (VVVVVVVV)`
 
 + T: Width of memory write (1, 2, 4, or 8 bytes).
-+ M: Memory region to write to (0 = Main NSO, 1 = Heap, 2 = Alias, 3 = Aslr, 4 = non-relative).
++ M: Memory region to write to (0 = Main NSO, 1 = Heap, 2 = Alias, 3 = Aslr).
 + R: Register to use as an offset from memory region base.
 + A: Immediate offset to use from memory region base.
 + V: Value to write.
@@ -62,13 +62,11 @@ Code type 0x1 performs a comparison of the contents of memory to a static value.
 If the condition is not met, all instructions until the appropriate End or Else conditional block terminator are skipped.
 
 #### Encoding
-`1TMCXrAA AAAAAAAA VVVVVVVV (VVVVVVVV)`
+`1TMC00AA AAAAAAAA VVVVVVVV (VVVVVVVV)`
 
-+ T: Width of memory read (1, 2, 4, or 8 bytes).
-+ M: Memory region to read from (0 = Main NSO, 1 = Heap, 2 = Alias, 3 = Aslr, 4 = non-relative).
++ T: Width of memory write (1, 2, 4, or 8 bytes).
++ M: Memory region to write to (0 = Main NSO, 1 = Heap, 2 = Alias, 3 = Aslr).
 + C: Condition to use, see below.
-+ X: Operand Type, see below.
-+ r: Offset Register (operand types 1).
 + A: Immediate offset to use from memory region base.
 + V: Value to compare to.
 
@@ -80,9 +78,6 @@ If the condition is not met, all instructions until the appropriate End or Else
 + 5: ==
 + 6: !=
 
-#### Operand Type
-+ 0: Memory Base + Relative Offset
-+ 1: Memory Base + Offset Register + Relative Offset
 ---
 
 ### Code Type 0x2: End Conditional Block
@@ -131,7 +126,7 @@ Code type 0x5 allows loading a value from memory into a register, either using a
 `5TMR00AA AAAAAAAA`
 
 + T: Width of memory read (1, 2, 4, or 8 bytes).
-+ M: Memory region to write to (0 = Main NSO, 1 = Heap, 2 = Alias, 3 = Aslr, 4 = non-relative).
++ M: Memory region to write to (0 = Main NSO, 1 = Heap, 2 = Alias, 3 = Aslr).
 + R: Register to load value into.
 + A: Immediate offset to use from memory region base.
 
@@ -142,22 +137,6 @@ Code type 0x5 allows loading a value from memory into a register, either using a
 + R: Register to load value into. (This register is also used as the base memory address).
 + A: Immediate offset to use from register R.
 
-#### Load from Register Address Encoding
-`5T0R2SAA AAAAAAAA`
-
-+ T: Width of memory read (1, 2, 4, or 8 bytes).
-+ R: Register to load value into. 
-+ S: Register to use as the base memory address.
-+ A: Immediate offset to use from register R.
-
-#### Load From Fixed Address Encoding with offset register
-`5TMR3SAA AAAAAAAA`
-
-+ T: Width of memory read (1, 2, 4, or 8 bytes).
-+ M: Memory region to write to (0 = Main NSO, 1 = Heap, 2 = Alias, 3 = Aslr, 4 = non-relative).
-+ R: Register to load value into.
-+ S: Register to use as offset register.
-+ A: Immediate offset to use from memory region base.
 ---
 
 ### Code Type 0x6: Store Static Value to Register Memory Address
@@ -271,10 +250,7 @@ Code type 0x9 allows performing arithmetic on registers.
 + 7: Logical Not (discards right-hand operand)
 + 8: Logical Xor
 + 9: None/Move (discards right-hand operand)
-+ 10: Float Addition, T==4 single T==8 double
-+ 11: Float Subtraction, T==4 single T==8 double
-+ 12: Float Multiplication, T==4 single T==8 double
-+ 13: Float Division, T==4 single T==8 double
+
 ---
 
 ### Code Type 0xA: Store Register to Memory Address
@@ -404,61 +380,6 @@ Code type 0xC3 reads or writes a static register with a given register.
 
 ---
 
-### Code Type 0xC4: Begin Extended Keypress Conditional Block
-Code type 0xC4 enters or skips a conditional block based on whether a key combination is pressed.
-
-#### Encoding
-`C4r00000 kkkkkkkk kkkkkkkk`
-
-+ r: Auto-repeat, see below.
-+ kkkkkkkkkk: Keypad mask to check against output of `hidKeysDown()`.
-
-Note that for multiple button combinations, the bitmasks should be OR'd together.
-
-#### Auto-repeat
-
-+ 0: The conditional block executes only once when the keypad mask matches. The mask must stop matching to reset for the next trigger.
-+ 1: The conditional block executes as long as the keypad mask matches.
-
-#### Keypad Values
-Note: This is the direct output of `hidKeysDown()`.
-
-+ 00000000 00000001: A
-+ 00000000 00000002: B
-+ 00000000 00000004: X
-+ 00000000 00000008: Y
-+ 00000000 00000010: Left Stick Pressed
-+ 00000000 00000020: Right Stick Pressed
-+ 00000000 00000040: L
-+ 00000000 00000080: R
-+ 00000000 00000100: ZL
-+ 00000000 00000200: ZR
-+ 00000000 00000400: Plus
-+ 00000000 00000800: Minus
-+ 00000000 00001000: Left
-+ 00000000 00002000: Up
-+ 00000000 00004000: Right
-+ 00000000 00008000: Down
-+ 00000000 00010000: Left Stick Left
-+ 00000000 00020000: Left Stick Up
-+ 00000000 00040000: Left Stick Right
-+ 00000000 00080000: Left Stick Down
-+ 00000000 00100000: Right Stick Left
-+ 00000000 00200000: Right Stick Up
-+ 00000000 00400000: Right Stick Right
-+ 00000000 00800000: Right Stick Down
-+ 00000000 01000000: SL Left Joy-Con
-+ 00000000 02000000: SR Left Joy-Con
-+ 00000000 04000000: SL Right Joy-Con
-+ 00000000 08000000: SR Right Joy-Con
-+ 00000000 10000000: Top button on Poké Ball Plus (Palma) controller
-+ 00000000 20000000: Verification
-+ 00000000 40000000: B button on Left NES/HVC controller in Handheld mode
-+ 00000000 80000000: Left C button in N64 controller
-+ 00000001 00000000: Up C button in N64 controller
-+ 00000002 00000000: Right C button in N64 controller
-+ 00000004 00000000: Down C button in N64 controller
-
 ### Code Type 0xF0: Double Extended-Width Instruction
 Code Type 0xF0 signals to the VM to treat the upper three nybbles of the first dword as instruction type, instead of just the upper nybble.
 

emummc/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/m4xw/emummc
 	branch = develop
-	commit = 3c57b20ba3820ec87d7dd239d6fcf9ba97510606
-	parent = d61ee942d9b34cadd80464d5d549c5e2e5bf1689
+	commit = d248ea6f700c3e6987549e30a1e2eeb609ce9f8c
+	parent = 9112461620330ba73a74926edd4c08b3cc0310f0
 	method = merge
 	cmdver = 0.4.1

emummc/README.md

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

emummc/source/FS/FS_offsets.c

@@ -75,12 +75,6 @@
 #include "offsets/1810_exfat.h"
 #include "offsets/1900.h"
 #include "offsets/1900_exfat.h"
-#include "offsets/2000.h"
-#include "offsets/2000_exfat.h"
-#include "offsets/2010.h"
-#include "offsets/2010_exfat.h"
-#include "offsets/2100.h"
-#include "offsets/2100_exfat.h"
 #include "../utils/fatal.h"
 
 #define GET_OFFSET_STRUCT_NAME(vers) g_offsets##vers
@@ -167,12 +161,6 @@ DEFINE_OFFSET_STRUCT(_1810);
 DEFINE_OFFSET_STRUCT(_1810_EXFAT);
 DEFINE_OFFSET_STRUCT(_1900);
 DEFINE_OFFSET_STRUCT(_1900_EXFAT);
-DEFINE_OFFSET_STRUCT(_2000);
-DEFINE_OFFSET_STRUCT(_2000_EXFAT);
-DEFINE_OFFSET_STRUCT(_2010);
-DEFINE_OFFSET_STRUCT(_2010_EXFAT);
-DEFINE_OFFSET_STRUCT(_2100);
-DEFINE_OFFSET_STRUCT(_2100_EXFAT);
 
 const fs_offsets_t *get_fs_offsets(enum FS_VER version) {
     switch (version) {
@@ -294,18 +282,6 @@ const fs_offsets_t *get_fs_offsets(enum FS_VER version) {
             return &(GET_OFFSET_STRUCT_NAME(_1900));
         case FS_VER_19_0_0_EXFAT:
             return &(GET_OFFSET_STRUCT_NAME(_1900_EXFAT));
-        case FS_VER_20_0_0:
-            return &(GET_OFFSET_STRUCT_NAME(_2000));
-        case FS_VER_20_0_0_EXFAT:
-            return &(GET_OFFSET_STRUCT_NAME(_2000_EXFAT));
-        case FS_VER_20_1_0:
-            return &(GET_OFFSET_STRUCT_NAME(_2010));
-        case FS_VER_20_1_0_EXFAT:
-            return &(GET_OFFSET_STRUCT_NAME(_2010_EXFAT));
-        case FS_VER_21_0_0:
-            return &(GET_OFFSET_STRUCT_NAME(_2100));
-        case FS_VER_21_0_0_EXFAT:
-            return &(GET_OFFSET_STRUCT_NAME(_2100_EXFAT));
         default:
             fatal_abort(Fatal_UnknownVersion);
     }

emummc/source/FS/FS_versions.h

@@ -110,15 +110,6 @@ enum FS_VER
     FS_VER_19_0_0,
     FS_VER_19_0_0_EXFAT,
 
-    FS_VER_20_0_0,
-    FS_VER_20_0_0_EXFAT,
-
-    FS_VER_20_1_0,
-    FS_VER_20_1_0_EXFAT,
-
-    FS_VER_21_0_0,
-    FS_VER_21_0_0_EXFAT,
-
     FS_VER_MAX,
 };
 

emummc/source/FS/offsets/2000.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef __FS_2000_H__
-#define __FS_2000_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_2000_SDMMC_ACCESSOR_GC   0x1A7DB0
-#define FS_OFFSET_2000_SDMMC_ACCESSOR_SD   0x1AA130
-#define FS_OFFSET_2000_SDMMC_ACCESSOR_NAND 0x1A8560
-
-// Hooks
-#define FS_OFFSET_2000_SDMMC_WRAPPER_READ  0x1A3C20
-#define FS_OFFSET_2000_SDMMC_WRAPPER_WRITE 0x1A3C80
-#define FS_OFFSET_2000_RTLD                0x2B594
-#define FS_OFFSET_2000_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x4C)))
-
-#define FS_OFFSET_2000_CLKRST_SET_MIN_V_CLK_RATE 0x1C6150
-
-// Misc funcs
-#define FS_OFFSET_2000_LOCK_MUTEX          0x19CD80
-#define FS_OFFSET_2000_UNLOCK_MUTEX        0x19CDD0
-
-#define FS_OFFSET_2000_SDMMC_WRAPPER_CONTROLLER_OPEN  0x1A3BE0
-#define FS_OFFSET_2000_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1A3C00
-
-// Misc Data
-#define FS_OFFSET_2000_SD_MUTEX            0xFF5408
-#define FS_OFFSET_2000_NAND_MUTEX          0xFF0CF0
-#define FS_OFFSET_2000_ACTIVE_PARTITION    0xFF0D30
-#define FS_OFFSET_2000_SDMMC_DAS_HANDLE    0xFD2B08
-
-// NOPs
-#define FS_OFFSET_2000_SD_DAS_INIT         0x289F4
-
-// Nintendo Paths
-#define FS_OFFSET_2000_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x0006DB14, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x0007CE1C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00084A08, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0009AE48, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_2000_H__

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

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef __FS_2000_EXFAT_H__
-#define __FS_2000_EXFAT_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_2000_EXFAT_SDMMC_ACCESSOR_GC   0x1B36D0
-#define FS_OFFSET_2000_EXFAT_SDMMC_ACCESSOR_SD   0x1B5A50
-#define FS_OFFSET_2000_EXFAT_SDMMC_ACCESSOR_NAND 0x1B3E80
-
-// Hooks
-#define FS_OFFSET_2000_EXFAT_SDMMC_WRAPPER_READ  0x1AF540
-#define FS_OFFSET_2000_EXFAT_SDMMC_WRAPPER_WRITE 0x1AF5A0
-#define FS_OFFSET_2000_EXFAT_RTLD                0x2B594
-#define FS_OFFSET_2000_EXFAT_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x4C)))
-
-#define FS_OFFSET_2000_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x1D1A70
-
-// Misc funcs
-#define FS_OFFSET_2000_EXFAT_LOCK_MUTEX          0x1A86A0
-#define FS_OFFSET_2000_EXFAT_UNLOCK_MUTEX        0x1A86F0
-
-#define FS_OFFSET_2000_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0x1AF500
-#define FS_OFFSET_2000_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1AF520
-
-// Misc Data
-#define FS_OFFSET_2000_EXFAT_SD_MUTEX            0x1006408
-#define FS_OFFSET_2000_EXFAT_NAND_MUTEX          0x1001CF0
-#define FS_OFFSET_2000_EXFAT_ACTIVE_PARTITION    0x1001D30
-#define FS_OFFSET_2000_EXFAT_SDMMC_DAS_HANDLE    0xFDFB08
-
-// NOPs
-#define FS_OFFSET_2000_EXFAT_SD_DAS_INIT         0x289F4
-
-// Nintendo Paths
-#define FS_OFFSET_2000_EXFAT_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x0006DB14, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x0007CE1C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00084A08, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0009AE48, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_2000_EXFAT_H__

emummc/source/FS/offsets/2010.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef __FS_2010_H__
-#define __FS_2010_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_2010_SDMMC_ACCESSOR_GC   0x1A7DB0
-#define FS_OFFSET_2010_SDMMC_ACCESSOR_SD   0x1AA130
-#define FS_OFFSET_2010_SDMMC_ACCESSOR_NAND 0x1A8560
-
-// Hooks
-#define FS_OFFSET_2010_SDMMC_WRAPPER_READ  0x1A3C20
-#define FS_OFFSET_2010_SDMMC_WRAPPER_WRITE 0x1A3C80
-#define FS_OFFSET_2010_RTLD                0x2B594
-#define FS_OFFSET_2010_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x4C)))
-
-#define FS_OFFSET_2010_CLKRST_SET_MIN_V_CLK_RATE 0x1C6150
-
-// Misc funcs
-#define FS_OFFSET_2010_LOCK_MUTEX          0x19CD80
-#define FS_OFFSET_2010_UNLOCK_MUTEX        0x19CDD0
-
-#define FS_OFFSET_2010_SDMMC_WRAPPER_CONTROLLER_OPEN  0x1A3BE0
-#define FS_OFFSET_2010_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1A3C00
-
-// Misc Data
-#define FS_OFFSET_2010_SD_MUTEX            0xFF5408
-#define FS_OFFSET_2010_NAND_MUTEX          0xFF0CF0
-#define FS_OFFSET_2010_ACTIVE_PARTITION    0xFF0D30
-#define FS_OFFSET_2010_SDMMC_DAS_HANDLE    0xFD2B08
-
-// NOPs
-#define FS_OFFSET_2010_SD_DAS_INIT         0x289F4
-
-// Nintendo Paths
-#define FS_OFFSET_2010_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x0006DB14, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x0007CE1C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00084A08, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0009AE48, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_2010_H__

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

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef __FS_2010_EXFAT_H__
-#define __FS_2010_EXFAT_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_2010_EXFAT_SDMMC_ACCESSOR_GC   0x1B36D0
-#define FS_OFFSET_2010_EXFAT_SDMMC_ACCESSOR_SD   0x1B5A50
-#define FS_OFFSET_2010_EXFAT_SDMMC_ACCESSOR_NAND 0x1B3E80
-
-// Hooks
-#define FS_OFFSET_2010_EXFAT_SDMMC_WRAPPER_READ  0x1AF540
-#define FS_OFFSET_2010_EXFAT_SDMMC_WRAPPER_WRITE 0x1AF5A0
-#define FS_OFFSET_2010_EXFAT_RTLD                0x2B594
-#define FS_OFFSET_2010_EXFAT_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x4C)))
-
-#define FS_OFFSET_2010_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x1D1A70
-
-// Misc funcs
-#define FS_OFFSET_2010_EXFAT_LOCK_MUTEX          0x1A86A0
-#define FS_OFFSET_2010_EXFAT_UNLOCK_MUTEX        0x1A86F0
-
-#define FS_OFFSET_2010_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0x1AF500
-#define FS_OFFSET_2010_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1AF520
-
-// Misc Data
-#define FS_OFFSET_2010_EXFAT_SD_MUTEX            0x1006408
-#define FS_OFFSET_2010_EXFAT_NAND_MUTEX          0x1001CF0
-#define FS_OFFSET_2010_EXFAT_ACTIVE_PARTITION    0x1001D30
-#define FS_OFFSET_2010_EXFAT_SDMMC_DAS_HANDLE    0xFDFB08
-
-// NOPs
-#define FS_OFFSET_2010_EXFAT_SD_DAS_INIT         0x289F4
-
-// Nintendo Paths
-#define FS_OFFSET_2010_EXFAT_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x0006DB14, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x0007CE1C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x00084A08, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0009AE48, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_2010_EXFAT_H__

emummc/source/FS/offsets/2100.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef __FS_2100_H__
-#define __FS_2100_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_2100_SDMMC_ACCESSOR_GC   0x1AC970
-#define FS_OFFSET_2100_SDMMC_ACCESSOR_SD   0x1AE980
-#define FS_OFFSET_2100_SDMMC_ACCESSOR_NAND 0x1ACFA0
-
-// Hooks
-#define FS_OFFSET_2100_SDMMC_WRAPPER_READ  0x1A8850
-#define FS_OFFSET_2100_SDMMC_WRAPPER_WRITE 0x1A88B0
-#define FS_OFFSET_2100_RTLD                0x2E1C0
-#define FS_OFFSET_2100_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x4C)))
-
-#define FS_OFFSET_2100_CLKRST_SET_MIN_V_CLK_RATE 0x1CB9B0
-
-// Misc funcs
-#define FS_OFFSET_2100_LOCK_MUTEX          0x1A17D0
-#define FS_OFFSET_2100_UNLOCK_MUTEX        0x1A1830
-
-#define FS_OFFSET_2100_SDMMC_WRAPPER_CONTROLLER_OPEN  0x1A8810
-#define FS_OFFSET_2100_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1A8830
-
-// Misc Data
-#define FS_OFFSET_2100_SD_MUTEX            0xFEE408
-#define FS_OFFSET_2100_NAND_MUTEX          0xFE9CF0
-#define FS_OFFSET_2100_ACTIVE_PARTITION    0xFE9D30
-#define FS_OFFSET_2100_SDMMC_DAS_HANDLE    0xFCBB18
-
-// NOPs
-#define FS_OFFSET_2100_SD_DAS_INIT         0x2B5C8
-
-// Nintendo Paths
-#define FS_OFFSET_2100_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x000718CC, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x000824F4, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0008AF18, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x000A0B8C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_2100_H__

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

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2019 m4xw <m4x@m4xw.net>
- * Copyright (c) 2019 Atmosphere-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef __FS_2100_EXFAT_EXFAT_H__
-#define __FS_2100_EXFAT_EXFAT_H__
-
-// Accessor vtable getters
-#define FS_OFFSET_2100_EXFAT_SDMMC_ACCESSOR_GC   0x1B7AD0
-#define FS_OFFSET_2100_EXFAT_SDMMC_ACCESSOR_SD   0x1B9AE0
-#define FS_OFFSET_2100_EXFAT_SDMMC_ACCESSOR_NAND 0x1B8100
-
-// Hooks
-#define FS_OFFSET_2100_EXFAT_SDMMC_WRAPPER_READ  0x1B39B0
-#define FS_OFFSET_2100_EXFAT_SDMMC_WRAPPER_WRITE 0x1B3A10
-#define FS_OFFSET_2100_EXFAT_RTLD                0x2E1C0
-#define FS_OFFSET_2100_EXFAT_RTLD_DESTINATION    ((uintptr_t)(INT64_C(-0x4C)))
-
-#define FS_OFFSET_2100_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x1D6B10
-
-// Misc funcs
-#define FS_OFFSET_2100_EXFAT_LOCK_MUTEX          0x1AC930
-#define FS_OFFSET_2100_EXFAT_UNLOCK_MUTEX        0x1AC990
-
-#define FS_OFFSET_2100_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN  0x1B3970
-#define FS_OFFSET_2100_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1B3990
-
-// Misc Data
-#define FS_OFFSET_2100_EXFAT_SD_MUTEX            0xFFF408
-#define FS_OFFSET_2100_EXFAT_NAND_MUTEX          0xFFACF0
-#define FS_OFFSET_2100_EXFAT_ACTIVE_PARTITION    0xFFAD30
-#define FS_OFFSET_2100_EXFAT_SDMMC_DAS_HANDLE    0xFD8B18
-
-// NOPs
-#define FS_OFFSET_2100_EXFAT_SD_DAS_INIT         0x2B5C8
-
-// Nintendo Paths
-#define FS_OFFSET_2100_EXFAT_NINTENDO_PATHS \
-{ \
-	{.opcode_reg = 3, .adrp_offset = 0x000718CC, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 3, .adrp_offset = 0x000824F4, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x0008AF18, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 4, .adrp_offset = 0x000A0B8C, .add_rel_offset = 0x00000004}, \
-	{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
-}
-
-#endif // __FS_2100_EXFAT_EXFAT_H__

emummc/source/utils/types.h

@@ -18,7 +18,6 @@
 #define _TYPES_H_
 
 #include <stdint.h>
-#include <stdbool.h>
 
 #define ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1))
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
@@ -59,6 +58,12 @@ typedef u32 Result; ///< Function error code result type.
 #define INVALID_HANDLE ((Handle) 0)
 #define CUR_PROCESS_HANDLE ((Handle) 0xFFFF8001)
 
+#ifndef __cplusplus
+typedef int bool;
+#define true  1
+#define false 0
+#endif /* __cplusplus */
+
 #define BOOT_CFG_AUTOBOOT_EN (1 << 0)
 #define BOOT_CFG_FROM_LAUNCH (1 << 1)
 #define BOOT_CFG_SEPT_RUN    (1 << 7)

exosphere/exosphere.mk

@@ -70,6 +70,6 @@ clean:
 	@$(MAKE) --no-print-directory -C $(ATMOSPHERE_LIBRARIES_DIR)/libexosphere -f $(ATMOSPHERE_LIBRARIES_DIR)/libexosphere/libexosphere.mk clean
 	@$(MAKE) --no-print-directory -C $(ATMOSPHERE_LIBRARIES_DIR)/libexosphere -f $(ATMOSPHERE_LIBRARIES_DIR)/libexosphere/libexosphere.mk clean ATMOSPHERE_CPU="$(strip $(ATMOSPHERE_BOOT_CPU))"
 	@rm -fr $(CURRENT_DIRECTORY)/$(ATMOSPHERE_OUT_DIR)
-	@for i in $(CURRENT_DIRECTORY)/$(ATMOSPHERE_OUT_DIR); do [ -d $$i ] && rmdir $$i 2>/dev/null || true; done
+	@for i in $(CURRENT_DIRECTORY)/$(ATMOSPHERE_OUT_DIR); do [ -d $$i ] && rmdir --ignore-fail-on-non-empty $$i || true; done
 
 .PHONY: all clean check_lib check_boot_lib check_loader_stub check_program check_mariko_fatal check_warmboot

exosphere/loader_stub/loader_stub.mk

@@ -15,12 +15,13 @@ ifneq ($(__RECURSIVE__),1)
 export ATMOSPHERE_TOPDIR := $(CURRENT_DIRECTORY)
 
 export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) $(CURDIR)/include \
-			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
+			$(foreach dir,$(DATA),$(CURDIR)/$(dir)) \
+            $(CURRENT_DIRECTORY)/../program/$(ATMOSPHERE_OUT_DIR)
 
 CFILES      :=	$(call FIND_SOURCE_FILES,$(SOURCES),c)
 CPPFILES    :=	$(call FIND_SOURCE_FILES,$(SOURCES),cpp)
 SFILES      :=	$(call FIND_SOURCE_FILES,$(SOURCES),s)
-BINFILES    :=
+BINFILES    := program.lz4 boot_code.lz4
 
 #---------------------------------------------------------------------------------
 # use CXX for linking C++ projects, CC for standard C
@@ -101,7 +102,13 @@ $(OUTPUT).elf	:	$(OFILES)
 
 $(OFILES)	:	 $(ATMOSPHERE_LIBRARIES_DIR)/libexosphere/$(ATMOSPHERE_LIBRARY_DIR)/libexosphere.a
 
-secmon_loader_main.o: CXXFLAGS += --embed-dir="$(CURRENT_DIRECTORY)/../program/$(ATMOSPHERE_OUT_DIR)/"
+program.lz4.o: program.lz4
+	@echo $(notdir $<)
+	@$(bin2o)
+
+boot_code.lz4.o: boot_code.lz4
+	@echo $(notdir $<)
+	@$(bin2o)
 
 %.elf:
 	@echo linking $(notdir $@)
@@ -110,6 +117,14 @@ secmon_loader_main.o: CXXFLAGS += --embed-dir="$(CURRENT_DIRECTORY)/../program/$
 
 $(OFILES_SRC)	: $(OFILES_BIN)
 
+#---------------------------------------------------------------------------------
+# you need a rule like this for each extension you use as binary data
+#---------------------------------------------------------------------------------
+%.bin.o	%_bin.h:	%.bin
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
+	@$(bin2o)
+
 -include $(DEPENDS)
 
 #---------------------------------------------------------------------------------------

exosphere/loader_stub/source/secmon_loader_main.cpp

@@ -15,31 +15,21 @@
  */
 #include <exosphere.hpp>
 #include "secmon_loader_uncompress.hpp"
+#include "program_lz4.h"
+#include "boot_code_lz4.h"
 
 namespace ams::secmon::loader {
 
-    namespace {
-
-        constexpr const u8 SecmonProgramLz4[] = {
-            #embed <program.lz4>
-        };
-
-        constexpr const u8 SecmonBootCodeLz4[] = {
-            #embed <boot_code.lz4>
-        };
-
-    }
-
-    NORETURN void UncompressAndExecute() {
+    NORETURN void UncompressAndExecute(const void *program, const void *boot_code) {
         /* Uncompress the program image. */
-        Uncompress(secmon::MemoryRegionPhysicalTzramFullProgramImage.GetPointer(), secmon::MemoryRegionPhysicalTzramFullProgramImage.GetSize(), SecmonProgramLz4, sizeof(SecmonProgramLz4));
+        Uncompress(secmon::MemoryRegionPhysicalTzramFullProgramImage.GetPointer(), secmon::MemoryRegionPhysicalTzramFullProgramImage.GetSize(), program, program_lz4_size);
 
         /* Copy the boot image to the end of IRAM */
-        u8 *relocated_boot_code = secmon::MemoryRegionPhysicalIramBootCodeImage.GetEndPointer<u8>() - sizeof(SecmonBootCodeLz4);
-        std::memcpy(relocated_boot_code, SecmonBootCodeLz4, sizeof(SecmonBootCodeLz4));
+        u8 *relocated_boot_code = secmon::MemoryRegionPhysicalIramBootCodeImage.GetEndPointer<u8>() - boot_code_lz4_size;
+        std::memcpy(relocated_boot_code, boot_code, boot_code_lz4_size);
 
         /* Uncompress the boot image. */
-        Uncompress(secmon::MemoryRegionPhysicalIramBootCodeImage.GetPointer(), secmon::MemoryRegionPhysicalIramBootCodeImage.GetSize(), relocated_boot_code, sizeof(SecmonBootCodeLz4));
+        Uncompress(secmon::MemoryRegionPhysicalIramBootCodeImage.GetPointer(), secmon::MemoryRegionPhysicalIramBootCodeImage.GetSize(), relocated_boot_code, boot_code_lz4_size);
 
         /* Jump to the boot image. */
         reinterpret_cast<void (*)()>(secmon::MemoryRegionPhysicalIramBootCodeImage.GetAddress())();

exosphere/loader_stub/source/start.s

@@ -98,5 +98,8 @@ _start:
     ldr x20, =0x7C020000
     mov sp, x20
 
+    adr x0, program_lz4
+    adr x1, boot_code_lz4
+
     /* Uncompress the program and iram boot code images. */
-    b _ZN3ams6secmon6loader20UncompressAndExecuteEv
+    b _ZN3ams6secmon6loader20UncompressAndExecuteEPKvS3_

exosphere/program/program.ld

@@ -106,7 +106,6 @@ SECTIONS
     .debug_code : {
         KEEP (*(.text._ZN3ams3log6PrintfEPKcz .text._ZN3ams3log7VPrintfEPKcSt9__va_list .text._ZN3ams3log4DumpEPKvm))
         KEEP (*(.text._ZN3ams4util10TVSNPrintfEPcmPKcSt9__va_list .text._ZN3ams4util12_GLOBAL__N_114TVSNPrintfImplEPcmPKcSt9__va_list .text._ZZN3ams4util12_GLOBAL__N_114TVSNPrintfImplEPcmPKcSt9__va_listENKUlbmE3_clEbm))
-        KEEP (*(.text._ZN3ams4util12_GLOBAL__N_1L14TVSNPrintfImplEPcmPKcSt9__va_list .text._ZZN3ams4util12_GLOBAL__N_1L14TVSNPrintfImplEPcmPKcSt9__va_listENKUlbmE_clEbm))
         KEEP(secmon_exception_handler.o(.text*))
         secmon_exception_handler.o(.rodata*)
         secmon_exception_handler.o(.data*)

exosphere/program/program.mk

@@ -119,7 +119,7 @@ DEPENDS	:=	$(OFILES:.o=.d)
 #---------------------------------------------------------------------------------
 
 $(OUTPUT).lz4	:	$(OUTPUT).bin
-	$(SILENTCMD)$(PYTHON) $(CURRENT_DIRECTORY)/split_program.py $(OUTPUT).bin $(CURRENT_DIRECTORY)/$(ATMOSPHERE_OUT_DIR)
+	@python $(CURRENT_DIRECTORY)/split_program.py $(OUTPUT).bin $(CURRENT_DIRECTORY)/$(ATMOSPHERE_OUT_DIR)
 	@echo built ... $(notdir $@)
 
 $(OUTPUT).bin	:	$(OUTPUT).elf

exosphere/program/source/boot/secmon_boot_key_data.s

@@ -85,10 +85,10 @@ _ZN3ams6secmon4boot15VolatileKeyDataE:
 /* We can get away with only including latest because exosphere supports newer-than-expected master key in engine. */
 /* TODO: Update on next change of keys. */
 /* Mariko Development Master Kek Source. */
-.byte 0x11, 0x1C, 0x13, 0x90, 0xD9, 0x5E, 0xB0, 0xA2, 0xE3, 0xD0, 0x0E, 0x5D, 0xC4, 0xFB, 0x9E, 0xDB
+.byte 0x65, 0x7B, 0x11, 0x46, 0x0E, 0xC2, 0x22, 0x5D, 0xB9, 0xF1, 0xF5, 0x00, 0xF9, 0x3E, 0x1F, 0x70
 
 /* Mariko Production Master Kek Source. */
-.byte 0xEB, 0xF3, 0x5B, 0x2D, 0x4A, 0x2D, 0xCE, 0x45, 0x3A, 0x6F, 0x61, 0x38, 0x0B, 0x00, 0x3B, 0x46
+.byte 0x31, 0xBE, 0x25, 0xFB, 0xDB, 0xB4, 0xEE, 0x49, 0x5C, 0x77, 0x05, 0xC2, 0x36, 0x9F, 0x34, 0x80
 
 /* Development Master Key Vectors. */
 .byte 0x46, 0x22, 0xB4, 0x51, 0x9A, 0x7E, 0xA7, 0x7F, 0x62, 0xA1, 0x1F, 0x8F, 0xC5, 0x3A, 0xDB, 0xFE /* Zeroes encrypted with Master Key 00. */
@@ -110,8 +110,6 @@ _ZN3ams6secmon4boot15VolatileKeyDataE:
 .byte 0x39, 0x1E, 0x7E, 0xF8, 0x7E, 0x73, 0xEA, 0x6F, 0xAF, 0x00, 0x3A, 0xB4, 0xAA, 0xB8, 0xB7, 0x59 /* Master key 0F encrypted with Master key 10. */
 .byte 0x0C, 0x75, 0x39, 0x15, 0x53, 0xEA, 0x81, 0x11, 0xA3, 0xE0, 0xDC, 0x3D, 0x0E, 0x76, 0xC6, 0xB8 /* Master key 10 encrypted with Master key 11. */
 .byte 0x90, 0x64, 0xF9, 0x08, 0x29, 0x88, 0xD4, 0xDC, 0x73, 0xA4, 0xA1, 0x13, 0x9E, 0x59, 0x85, 0xA0 /* Master key 11 encrypted with Master key 12. */
-.byte 0x94, 0x46, 0x3B, 0xFA, 0x7D, 0xB9, 0xE2, 0x94, 0xC2, 0x9D, 0xB9, 0xA4, 0xB2, 0x56, 0xCA, 0xFE /* Master key 12 encrypted with Master key 13. */
-.byte 0x74, 0xB2, 0x5F, 0xA0, 0x4B, 0x74, 0x6D, 0x47, 0x5B, 0xA9, 0xF5, 0x26, 0x46, 0xD7, 0x4B, 0x6E /* Master key 13 encrypted with Master key 14. */
 
 /* Production Master Key Vectors. */
 .byte 0x0C, 0xF0, 0x59, 0xAC, 0x85, 0xF6, 0x26, 0x65, 0xE1, 0xE9, 0x19, 0x55, 0xE6, 0xF2, 0x67, 0x3D /* Zeroes encrypted with Master Key 00. */
@@ -133,8 +131,6 @@ _ZN3ams6secmon4boot15VolatileKeyDataE:
 .byte 0x25, 0x12, 0x8B, 0xCB, 0xB5, 0x46, 0xA1, 0xF8, 0xE0, 0x52, 0x15, 0xB7, 0x0B, 0x57, 0x00, 0xBD /* Master key 0F encrypted with Master key 10. */
 .byte 0x58, 0x15, 0xD2, 0xF6, 0x8A, 0xE8, 0x19, 0xAB, 0xFB, 0x2D, 0x52, 0x9D, 0xE7, 0x55, 0xF3, 0x93 /* Master key 10 encrypted with Master key 11. */
 .byte 0x4A, 0x01, 0x3B, 0xC7, 0x44, 0x6E, 0x45, 0xBD, 0xE6, 0x5E, 0x2B, 0xEC, 0x07, 0x37, 0x52, 0x86 /* Master key 11 encrypted with Master key 12. */
-.byte 0x97, 0xE4, 0x11, 0xAB, 0x22, 0x72, 0x1A, 0x1F, 0x70, 0x5C, 0x00, 0xB3, 0x96, 0x30, 0x05, 0x28 /* Master key 12 encrypted with Master key 13. */
-.byte 0xF7, 0x92, 0xC0, 0xEC, 0xF3, 0xA4, 0x8C, 0xB7, 0x0D, 0xB3, 0xF3, 0xAB, 0x10, 0x9B, 0x18, 0xBA /* Master key 13 encrypted with Master key 14. */
 
 /* Device Master Key Source Sources. */
 .byte 0x8B, 0x4E, 0x1C, 0x22, 0x42, 0x07, 0xC8, 0x73, 0x56, 0x94, 0x08, 0x8B, 0xCC, 0x47, 0x0F, 0x5D /* 4.0.0  Device Master Key Source Source. */
@@ -153,8 +149,6 @@ _ZN3ams6secmon4boot15VolatileKeyDataE:
 .byte 0xDA, 0xB9, 0xD6, 0x77, 0x52, 0x2D, 0x1F, 0x78, 0x73, 0xC9, 0x98, 0x5B, 0x06, 0xFE, 0xA0, 0x52 /* 17.0.0 Device Master Key Source Source. */
 .byte 0x14, 0xF5, 0xA5, 0xD0, 0x73, 0x6D, 0x44, 0x80, 0x5F, 0x31, 0x5A, 0x8F, 0x1E, 0xD4, 0x0D, 0x63 /* 18.0.0 Device Master Key Source Source. */
 .byte 0x07, 0x38, 0x9A, 0xEC, 0x9C, 0xBD, 0x50, 0x4A, 0x4C, 0x1F, 0x04, 0xDA, 0x40, 0x68, 0x29, 0xE3 /* 19.0.0 Device Master Key Source Source. */
-.byte 0xA3, 0x6B, 0x0A, 0xB5, 0x6F, 0x57, 0x4C, 0x5E, 0x00, 0xFD, 0x56, 0x21, 0xF5, 0x06, 0x6B, 0xD1 /* 20.0.0 Device Master Key Source Source. */
-.byte 0xF9, 0x62, 0x05, 0x99, 0xE0, 0xB9, 0xA6, 0x9B, 0x9D, 0xAA, 0xB4, 0x12, 0x0B, 0x0F, 0xF5, 0x8F /* 21.0.0 Device Master Key Source Source. */
 
 /* Development Device Master Kek Sources. */
 .byte 0xD6, 0xBD, 0x9F, 0xC6, 0x18, 0x09, 0xE1, 0x96, 0x20, 0x39, 0x60, 0xD2, 0x89, 0x83, 0x31, 0x34 /* 4.0.0  Device Master Kek Source. */
@@ -173,8 +167,6 @@ _ZN3ams6secmon4boot15VolatileKeyDataE:
 .byte 0x4E, 0xCE, 0x7B, 0x2A, 0xEA, 0x2E, 0x3D, 0x16, 0xD5, 0x2A, 0xDE, 0xF6, 0xF8, 0x6A, 0x7D, 0x43 /* 17.0.0 Device Master Kek Source. */
 .byte 0x3B, 0x00, 0x89, 0xD7, 0xA9, 0x9E, 0xB7, 0x70, 0x86, 0x00, 0xC3, 0x49, 0x52, 0x8C, 0xA4, 0xAF /* 18.0.0 Device Master Kek Source. */
 .byte 0xAE, 0x78, 0x36, 0xB6, 0x91, 0xEB, 0xAF, 0x9C, 0x18, 0xF1, 0xC0, 0xD5, 0x8A, 0x0C, 0x7C, 0xA1 /* 19.0.0 Device Master Kek Source. */
-.byte 0x09, 0x12, 0x4F, 0x26, 0x90, 0xB9, 0xA6, 0xF5, 0xA5, 0x18, 0x74, 0xB6, 0x8D, 0x80, 0x59, 0x3D /* 20.0.0 Device Master Kek Source. */
-.byte 0x7A, 0x4C, 0x38, 0xB7, 0x03, 0x6B, 0x1E, 0x81, 0x20, 0x53, 0x14, 0x99, 0xA4, 0x21, 0x92, 0x9F /* 21.0.0 Device Master Kek Source. */
 
 /* Production Device Master Kek Sources. */
 .byte 0x88, 0x62, 0x34, 0x6E, 0xFA, 0xF7, 0xD8, 0x3F, 0xE1, 0x30, 0x39, 0x50, 0xF0, 0xB7, 0x5D, 0x5D /* 4.0.0  Device Master Kek Source. */
@@ -193,5 +185,3 @@ _ZN3ams6secmon4boot15VolatileKeyDataE:
 .byte 0x21, 0xD6, 0x35, 0xF1, 0x0F, 0x7A, 0xF0, 0x5D, 0xDF, 0x79, 0x1C, 0x7A, 0xE4, 0x32, 0x82, 0x9E /* 17.0.0 Device Master Kek Source. */
 .byte 0xE7, 0x85, 0x8C, 0xA2, 0xF4, 0x49, 0xCB, 0x07, 0xD1, 0x8E, 0x48, 0x1B, 0xE8, 0x1E, 0x28, 0x3B /* 18.0.0 Device Master Kek Source. */
 .byte 0x9B, 0xA5, 0xFD, 0x74, 0x7F, 0xCD, 0x23, 0xD1, 0xD9, 0xBD, 0x6C, 0x51, 0x72, 0x5F, 0x3D, 0x1F /* 19.0.0 Device Master Kek Source. */
-.byte 0xDA, 0xFB, 0x61, 0x39, 0x48, 0x2D, 0xC2, 0x7E, 0x0D, 0x8E, 0x8F, 0x98, 0x57, 0x20, 0xB8, 0x15 /* 20.0.0 Device Master Kek Source. */
-.byte 0x92, 0xBF, 0x37, 0x80, 0x0E, 0x79, 0x56, 0x8C, 0x57, 0x75, 0x72, 0x0A, 0x48, 0xD8, 0x15, 0x39 /* 21.0.0 Device Master Kek Source. */

exosphere/program/source/boot/secmon_package2.cpp

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

exosphere/program/source/smc/secmon_smc_register_access.cpp

@@ -101,10 +101,10 @@ namespace ams::secmon::smc {
         #include "secmon_define_mc01_access_table.inc"
 
         constexpr const AccessTableEntry AccessTables[] = {
-            {  PmcAccessTable::ReducedAccessTable.data(),                            MemoryRegionVirtualDevicePmc.GetAddress(),                PmcAccessTable::Address,                                                             PmcAccessTable::Size, },
-            {   McAccessTable::ReducedAccessTable.data(),                            MemoryRegionVirtualDeviceMemoryController.GetAddress(),    McAccessTable::Address,                                                              McAccessTable::Size, },
-            { Mc01AccessTable::ReducedAccessTable.data(), Mc01AccessTable::Address + MemoryRegionVirtualDeviceMemoryController0.GetAddress(), Mc01AccessTable::Address + MemoryRegionPhysicalDeviceMemoryController0.GetAddress(), Mc01AccessTable::Size, },
-            { Mc01AccessTable::ReducedAccessTable.data(), Mc01AccessTable::Address + MemoryRegionVirtualDeviceMemoryController1.GetAddress(), Mc01AccessTable::Address + MemoryRegionPhysicalDeviceMemoryController1.GetAddress(), Mc01AccessTable::Size, },
+            {  PmcAccessTable::ReducedAccessTable.data(), MemoryRegionVirtualDevicePmc.GetAddress(),                PmcAccessTable::Address,                                                             PmcAccessTable::Size, },
+            {   McAccessTable::ReducedAccessTable.data(), MemoryRegionVirtualDeviceMemoryController.GetAddress(),    McAccessTable::Address,                                                              McAccessTable::Size, },
+            { Mc01AccessTable::ReducedAccessTable.data(), MemoryRegionVirtualDeviceMemoryController0.GetAddress(), Mc01AccessTable::Address + MemoryRegionPhysicalDeviceMemoryController0.GetAddress(), Mc01AccessTable::Size, },
+            { Mc01AccessTable::ReducedAccessTable.data(), MemoryRegionVirtualDeviceMemoryController1.GetAddress(), Mc01AccessTable::Address + MemoryRegionPhysicalDeviceMemoryController1.GetAddress(), Mc01AccessTable::Size, },
         };
 
         constexpr bool IsAccessAllowed(const AccessTableEntry &entry, uintptr_t address) {

fusee/fusee.mk

@@ -43,6 +43,6 @@ clean:
 	@$(MAKE) --no-print-directory -C $(CURRENT_DIRECTORY)/loader_stub -f $(CURRENT_DIRECTORY)/loader_stub/loader_stub.mk clean
 	@$(MAKE) --no-print-directory -C $(CURRENT_DIRECTORY)/program -f $(CURRENT_DIRECTORY)/program/program.mk clean
 	@rm -fr $(CURRENT_DIRECTORY)/$(ATMOSPHERE_OUT_DIR)
-	@for i in $(CURRENT_DIRECTORY)/$(ATMOSPHERE_OUT_DIR); do [ -d $$i ] && rmdir $$i 2>/dev/null || true; done
+	@for i in $(CURRENT_DIRECTORY)/$(ATMOSPHERE_OUT_DIR); do [ -d $$i ] && rmdir --ignore-fail-on-non-empty $$i || true; done
 
 .PHONY: all clean check_lib check_loader_stub check_program