Merge pull request #2844 from alula/23_support

23.0.0: kernel changes

libraries/libstratosphere/include/stratosphere/cfg/cfg_types.hpp

@@ -35,6 +35,7 @@ namespace ams::cfg {
             OverrideStatusFlag_AddressSpace64BitDeprecated   = (svc::CreateProcessFlag_AddressSpace64BitDeprecated   >> svc::CreateProcessFlag_AddressSpaceShift) << OverrideStatusFlag_AddressSpaceShift,
             OverrideStatusFlag_AddressSpace32BitWithoutAlias = (svc::CreateProcessFlag_AddressSpace32BitWithoutAlias >> svc::CreateProcessFlag_AddressSpaceShift) << OverrideStatusFlag_AddressSpaceShift,
             OverrideStatusFlag_AddressSpace64Bit             = (svc::CreateProcessFlag_AddressSpace64Bit             >> svc::CreateProcessFlag_AddressSpaceShift) << OverrideStatusFlag_AddressSpaceShift,
+            OverrideStatusFlag_AddressSpace64Bit64KPage      = (svc::CreateProcessFlag_AddressSpace64Bit64KPage   >> svc::CreateProcessFlag_AddressSpaceShift) << OverrideStatusFlag_AddressSpaceShift,
             #endif
         };
 

libraries/libstratosphere/include/stratosphere/ldr/ldr_types.hpp

@@ -235,11 +235,16 @@ namespace ams::ldr {
             MetaFlag_PreventCodeReads               = (1 << 7),
         };
 
+        enum MetaFlag2 {
+            MetaFlag2_EnableShadowStack = (1 << 0),
+        };
+
         enum AddressSpaceType {
             AddressSpaceType_32Bit              = 0,
             AddressSpaceType_64BitDeprecated    = 1,
             AddressSpaceType_32BitWithoutAlias  = 2,
             AddressSpaceType_64Bit              = 3,
+            AddressSpaceType_64Bit64KPage       = 4,
         };
 
         #if defined(ATMOSPHERE_OS_HORIZON)
@@ -247,13 +252,14 @@ namespace ams::ldr {
             static_assert(AddressSpaceType_64BitDeprecated    == (svc::CreateProcessFlag_AddressSpace64BitDeprecated   >> svc::CreateProcessFlag_AddressSpaceShift));
             static_assert(AddressSpaceType_32BitWithoutAlias  == (svc::CreateProcessFlag_AddressSpace32BitWithoutAlias >> svc::CreateProcessFlag_AddressSpaceShift));
             static_assert(AddressSpaceType_64Bit              == (svc::CreateProcessFlag_AddressSpace64Bit             >> svc::CreateProcessFlag_AddressSpaceShift));
+            static_assert(AddressSpaceType_64Bit64KPage       == (svc::CreateProcessFlag_AddressSpace64Bit64KPage      >> svc::CreateProcessFlag_AddressSpaceShift));
         #endif
 
         u32 magic;
         u32 signature_key_generation;
         u8  reserved_08[4];
         u8  flags;
-        u8  reserved_0D;
+        u8  flags2;
         u8 main_thread_priority;
         u8 default_cpu_id;
         u8  reserved_10[4];

libraries/libstratosphere/source/cfg/cfg_override.board.nintendo_nx.inc

@@ -153,6 +153,8 @@ namespace ams::cfg {
         impl::OverrideStatusFlag ParseOverrideAddressSpace(const char *value) {
             if (strcasecmp(value, "39_bit") == 0 || strcasecmp(value, "39") == 0) {
                 return impl::OverrideStatusFlag_AddressSpace64Bit;
+            } else if (strcasecmp(value, "42_bit") == 0 || strcasecmp(value, "42") == 0) {
+                return impl::OverrideStatusFlag_AddressSpace64Bit64KPage;
             } else if (strcasecmp(value, "36_bit") == 0 || strcasecmp(value, "36") == 0) {
                 return impl::OverrideStatusFlag_AddressSpace64BitDeprecated;
             } else if (strcasecmp(value, "32_bit") == 0 || strcasecmp(value, "32") == 0) {

libraries/libstratosphere/source/osdbg/impl/osdbg_thread_info.os.horizon.hpp

@@ -28,7 +28,9 @@ namespace ams::osdbg::impl {
 
     constexpr inline bool IsLp64(const ThreadInfo *info) {
         const auto as = info->_debug_info_create_process.flags & svc::CreateProcessFlag_AddressSpaceMask;
-        return as == svc::CreateProcessFlag_AddressSpace64Bit || as == svc::CreateProcessFlag_AddressSpace64BitDeprecated;
+        return as == svc::CreateProcessFlag_AddressSpace64Bit 
+            || as == svc::CreateProcessFlag_AddressSpace64BitDeprecated 
+            || as == svc::CreateProcessFlag_AddressSpace64Bit64KPage;
     }
 
     constexpr inline bool Is64BitArch(const ThreadInfo *info) {