os: update os namespace for 15.0.0, loader/ro: update to use csrng, spl: bump max sessions

libraries/libstratosphere/include/stratosphere/os.hpp

@@ -28,6 +28,7 @@
 #include <stratosphere/os/os_process_handle_api.hpp>
 #include <stratosphere/os/os_process_memory_api.hpp>
 #include <stratosphere/os/os_process_code_memory_api.hpp>
+#include <stratosphere/os/os_insecure_memory_api.hpp>
 #include <stratosphere/os/os_random.hpp>
 #include <stratosphere/os/os_mutex.hpp>
 #include <stratosphere/os/os_condition_variable.hpp>

libraries/libstratosphere/include/stratosphere/os/os_insecure_memory_api.hpp

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#include <stratosphere/os/os_memory_common.hpp>
+
+namespace ams::os {
+
+    Result AllocateInsecureMemory(uintptr_t *out_address, size_t size);
+    void FreeInsecureMemory(uintptr_t address, size_t size);
+
+}

libraries/libstratosphere/include/stratosphere/os/os_interrupt_event_api.hpp

@@ -17,6 +17,7 @@
 #pragma once
 #include <vapours.hpp>
 #include <stratosphere/os/os_interrupt_event_common.hpp>
+#include <stratosphere/os/os_native_handle.hpp>
 
 namespace ams::os {
 
@@ -31,6 +32,8 @@ namespace ams::os {
     bool TimedWaitInterruptEvent(InterruptEventType *event, TimeSpan timeout);
     void ClearInterruptEvent(InterruptEventType *event);
 
+    NativeHandle GetInterruptEventHandle(const InterruptEventType *event);
+
     void InitializeMultiWaitHolder(MultiWaitHolderType *multi_wait_holder, InterruptEventType *event);
 
 }

libraries/libstratosphere/include/stratosphere/os/os_memory_common.hpp

@@ -18,6 +18,8 @@
 
 namespace ams::os {
 
+    using AddressSpaceGenerateRandomFunction = u64 (*)(u64);
+
     enum MemoryPermission {
         MemoryPermission_None        = (0 << 0),
         MemoryPermission_ReadOnly    = (1 << 0),

libraries/libstratosphere/include/stratosphere/os/os_process_code_memory_api.hpp

@@ -25,7 +25,7 @@ namespace ams::os {
         u64 size;
     };
 
-    Result MapProcessCodeMemory(u64 *out, NativeHandle handle, const ProcessMemoryRegion *regions, size_t num_regions);
+    Result MapProcessCodeMemory(u64 *out, NativeHandle handle, const ProcessMemoryRegion *regions, size_t num_regions, AddressSpaceGenerateRandomFunction generate_random);
     Result UnmapProcessCodeMemory(NativeHandle handle, u64 process_code_address, const ProcessMemoryRegion *regions, size_t num_regions);
 
 }

libraries/libstratosphere/include/stratosphere/os/os_process_memory_api.hpp

@@ -20,7 +20,7 @@
 
 namespace ams::os {
 
-    Result MapProcessMemory(void **out, NativeHandle handle, u64 process_address, size_t process_size);
+    Result MapProcessMemory(void **out, NativeHandle handle, u64 process_address, size_t process_size, AddressSpaceGenerateRandomFunction generate_random);
     void UnmapProcessMemory(void *mapped_memory, NativeHandle handle, u64 process_address, size_t process_size);
 
     Result SetProcessMemoryPermission(NativeHandle handle, u64 process_address, u64 process_size, MemoryPermission perm);

libraries/libstratosphere/include/stratosphere/svc/svc_stratosphere_shims.hpp

@@ -503,6 +503,14 @@
                     ::svcCallSecureMonitor(reinterpret_cast<::SecmonArgs *>(args));
                 }
 
+                ALWAYS_INLINE Result MapInsecureMemory(::ams::svc::Address address, ::ams::svc::Size size) {
+                    R_RETURN(::svcMapInsecureMemory(reinterpret_cast<void *>(static_cast<uintptr_t>(address)), size));
+                }
+
+                ALWAYS_INLINE Result UnmapInsecureMemory(::ams::svc::Address address, ::ams::svc::Size size) {
+                    R_RETURN(::svcUnmapInsecureMemory(reinterpret_cast<void *>(static_cast<uintptr_t>(address)), size));
+                }
+
             }
 
         #endif