git subrepo push libraries

subrepo:
  subdir:   "libraries"
  merged:   "726a7efdd"
upstream:
  origin:   "https://github.com/Atmosphere-NX/Atmosphere-libs"
  branch:   "master"
  commit:   "726a7efdd"
git-subrepo:
  version:  "0.4.1"
  origin:   "???"
  commit:   "???"

docs/changelog.md

@@ -15,9 +15,10 @@
     + If you are a developer interested in adding support for another target, please reach out to `SciresM#0524` on discord.
   + This is intended to finally allow sanely testing Atmosphère's code, by allowing most of it to run on a PC (with access to a debugger) instead of on game console hardware.
   + In addition, this will allow making PC tools which reuse code written for Atmosphère directly..
-  + **Please Note**: This has no relation to interacting with official software on PC whatsoever. This does not and is not intended to enable anything with official software, it only really allows for making tests and self-contained atmosphère-based tools.
-  + In the course of adding this support (and working on tooling using it), a number of major revisions were added to stratosphere:
-    +
+  + **Please Note**: This has no relation to interacting with official software on PC whatsoever. This really allows for making tests and self-contained atmosphère-based command-line tools; the Atmosphère project continues to have zero interest in attempting to run official software of any kind.
+  + In the course of adding this support (and working on tooling using it), a number of fairly major revisions were made to stratosphere (particularly surrounding filesystem code).
+    + **Please Note**: A number of changes made for this (and ones necessary in the process of adding support for 14.0.0) are api-breaking.
+      + If you're a developer and any of this caused your code to break, please feel free to contact `SciresM#0524` for help updating your program.
 + General system stability improvements to enhance the user's experience.
 ## 1.2.6
 + Support was added for 13.2.1.

emummc/.gitrepo

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

emummc/source/nx/cache.s

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

libraries/.gitrepo

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

libraries/config/templates/stratosphere.mk

@@ -67,6 +67,8 @@ endif
 
 ifeq ($(ATMOSPHERE_BOARD),nx-hac-001)
 export LDFLAGS     = -specs=$(ATMOSPHERE_LIBRARIES_DIR)/libstratosphere/stratosphere.specs -specs=$(DEVKITPRO)/libnx/switch.specs $(CXXFLAGS) $(CXXWRAPS) $(CXXREQUIRED) -Wl,-Map,$(notdir $*.map)
+else ifeq ($(ATMOSPHERE_COMPILER_NAME),clang)
+export LDFLAGS     = $(CXXFLAGS) $(CXXWRAPS) $(CXXREQUIRED) -Wl,-map,$(notdir $@.map)
 else
 export LDFLAGS     = $(CXXFLAGS) $(CXXWRAPS) $(CXXREQUIRED) -Wl,-Map,$(notdir $@.map)
 endif

libraries/libstratosphere/include/stratosphere/fs/common/fs_directory_path_parser.hpp

@@ -101,10 +101,9 @@ namespace ams::fs {
                 s32 i;
                 for (i = m_position; m_buffer[i] != StringTraits::DirectorySeparator; ++i) {
                     if (m_buffer[i] == StringTraits::NullTerminator) {
-                        if (i == m_position) {
-                            m_position = -1;
-                            return nullptr;
-                        }
+                        char * const ret = (i != m_position) ? m_buffer + m_position : nullptr;
+                        m_position = -1;
+                        return ret;
                     }
                 }
 

libraries/libstratosphere/include/stratosphere/fssystem/fssystem_directory_redirection_filesystem.hpp

@@ -41,8 +41,8 @@ namespace ams::fssystem {
         private:
             Result ResolveFullPath(fs::Path *out, const fs::Path &path) {
                 if (path.IsMatchHead(m_before_dir.GetString(), m_before_dir.GetLength())) {
-                    R_TRY(out->InitializeWithFormat("%s%s", m_after_dir.GetString(), path.GetString() + m_before_dir.GetLength()));
-                    R_TRY(out->Normalize(fs::PathFlags{}));
+                    R_TRY(out->Initialize(m_after_dir));
+                    R_TRY(out->AppendChild(path));
                 } else {
                     R_TRY(out->Initialize(path));
                 }

libraries/libstratosphere/source/ncm/ncm_extended_data_mapper.hpp

@@ -69,6 +69,7 @@ namespace ams::ncm {
                 /* Set as dirty/not mapped. */
                 m_is_dirty  = false;
                 m_is_mapped = false;
+                R_SUCCEED();
             }
 
             Result GetMappedMemoryImpl(MappedMemory *out, size_t offset, size_t size) {

libraries/libstratosphere/source/pm/pm_shell_api.cpp

@@ -53,10 +53,10 @@ namespace ams::pm::shell {
     Result BoostApplicationThreadResourceLimit() {
         return ::pmshellBoostApplicationThreadResourceLimit();
     }
-    #endif
 
     Result BoostSystemThreadResourceLimit() {
         return ::pmshellBoostSystemThreadResourceLimit();
     }
+    #endif
 
 }

libraries/libvapours/source/crypto/impl/crypto_aes_impl.arch.arm64.cpp

@@ -205,7 +205,7 @@ namespace ams::crypto::impl {
         AMS_UNUSED(src_size, dst_size);
 
         /* Get the key. */
-        const u8 *key8 = reinterpret_cast<const u8 *>(m_round_keys) + (RoundCount + BlockSize);
+        const u8 *key8 = reinterpret_cast<const u8 *>(m_round_keys) + (RoundCount * BlockSize);
 
         /* Read the block. */
         uint8x16_t block = vld1q_u8(static_cast<const u8 *>(src));
@@ -232,7 +232,7 @@ namespace ams::crypto::impl {
     }
 
     /* Specializations when building specifically for cortex-a57 (or for apple M* processors). */
-    #if defined(ATMOSPHERE_CPU_CORTEX_A57) || defined(ATMOSPHERE_OS_MACOS)
+    #if defined(ATMOSPHERE_CPU_ARM_CORTEX_A57) || defined(ATMOSPHERE_OS_MACOS)
 
     namespace {
 

stratosphere/ams_mitm/source/bpc_mitm/bpc_mitm_service.hpp

@@ -30,11 +30,12 @@ namespace ams::mitm::bpc {
         public:
             static bool ShouldMitm(const sm::MitmProcessInfo &client_info) {
                 /* We will mitm:
-                 * - am, to intercept the Reboot/Power buttons in the overlay menu.
+                 * - am (omm on 14.0.0+), to intercept the Reboot/Power buttons in the overlay menu.
                  * - fatal, to simplify payload reboot logic significantly
                  * - hbl, to allow homebrew to take advantage of the feature.
                  */
                 return client_info.program_id == ncm::SystemProgramId::Am ||
+                       client_info.program_id == ncm::SystemProgramId::Omm ||
                        client_info.program_id == ncm::SystemProgramId::Fatal ||
                        client_info.override_status.IsHbl();
             }

stratosphere/ams_mitm/source/sysupdater/sysupdater_async_thread_allocator.cpp

@@ -21,7 +21,7 @@ namespace ams::mitm::sysupdater {
     namespace {
 
         constexpr inline int AsyncThreadCount = 1;
-        constexpr inline size_t AsyncThreadStackSize = 16_KB;
+        constexpr inline size_t AsyncThreadStackSize = 32_KB;
 
         os::ThreadType g_async_threads[AsyncThreadCount];
         alignas(os::ThreadStackAlignment) u8 g_async_thread_stack_heap[AsyncThreadCount * AsyncThreadStackSize];

stratosphere/loader/source/ldr_embedded_usb_patches.inc

@@ -39,6 +39,11 @@ constexpr inline const EmbeddedPatchEntry Usb30ForceEnablePatches_13_0_0[] = {
     { 0x84B4, "\x20\x00\x80\x52\xC0\x03\x5F\xD6", 8 },
 };
 
+constexpr inline const EmbeddedPatchEntry Usb30ForceEnablePatches_14_0_0[] = {
+    { 0x7414, "\x20\x00\x80\x52\xC0\x03\x5F\xD6", 8 },
+    { 0x74A4, "\x20\x00\x80\x52\xC0\x03\x5F\xD6", 8 },
+};
+
 constexpr inline const EmbeddedPatch Usb30ForceEnablePatches[] = {
     { ParseModuleId("C0D3F4E87E8B0FE9BBE9F1968A20767F3DC08E03"), util::size(Usb30ForceEnablePatches_9_0_0),  Usb30ForceEnablePatches_9_0_0 },
     { ParseModuleId("B9C700CA8335F8BAA0D2041D8D09F772890BA988"), util::size(Usb30ForceEnablePatches_10_0_0), Usb30ForceEnablePatches_10_0_0 },
@@ -46,4 +51,5 @@ constexpr inline const EmbeddedPatch Usb30ForceEnablePatches[] = {
     { ParseModuleId("F3F88D90EF6B3B6358EDEBAF87D56FA88D3A081C"), util::size(Usb30ForceEnablePatches_12_0_0), Usb30ForceEnablePatches_12_0_0 }, /* 12.0.0 - 12.0.3 */
     { ParseModuleId("A109046278AA99353C20EC38B57C495B74A06D91"), util::size(Usb30ForceEnablePatches_12_0_0), Usb30ForceEnablePatches_12_0_0 }, /* 12.1.0 */
     { ParseModuleId("69384BF4A543C62C4342C94E5E2CED3C5A675251"), util::size(Usb30ForceEnablePatches_13_0_0), Usb30ForceEnablePatches_13_0_0 }, /* 13.0.0 - 13.1.0 */
+    { ParseModuleId("1C97AFF30D48AFFEB74B28A530D30ABA0ABB9FFF"), util::size(Usb30ForceEnablePatches_14_0_0), Usb30ForceEnablePatches_14_0_0 }, /* 14.0.0 */
 };