Switch atmosphere's build target to C++20. (#952)

* ams: update to build with gcc10/c++20

* remove mno-outline-atomics

* ams: take care of most TODO C++20s

* fusee/sept: update for gcc10

* whoosh, your code now uses pre-compiled headers

* make: dependency fixes

stratosphere/ams_mitm/source/amsmitm_main.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "amsmitm_initialization.hpp"
 #include "amsmitm_module_management.hpp"
 #include "bpc_mitm/bpc_ams_power_utils.hpp"

stratosphere/ams_mitm/source/amsmitm_module.hpp

@@ -19,21 +19,25 @@
 namespace ams::mitm {
 
     /* TODO: C++20 Concepts will make this a lot less stupid. */
-    class ModuleBase {};
+    template<typename T>
+    concept IsModule = requires(T, void *arg) {
+        { T::ThreadPriority      } -> std::convertible_to<s32>;
+        { T::StackSize           } -> std::convertible_to<size_t>;
+        { T::Stack               } -> std::convertible_to<void *>;
+        { T::ThreadFunction(arg) } -> std::same_as<void>;
+    };
 
-    #define DEFINE_MITM_MODULE_CLASS(ss, prio) class MitmModule : public ::ams::mitm::ModuleBase { \
-        public:                                                                                    \
-            static constexpr s32 ThreadPriority = prio;                                            \
-            static constexpr size_t StackSize = ss;                                                \
-            alignas(os::ThreadStackAlignment) static inline u8 Stack[StackSize];                   \
-        public:                                                                                    \
-            static void ThreadFunction(void *);                                                    \
+    #define DEFINE_MITM_MODULE_CLASS(ss, prio) class MitmModule {                \
+        public:                                                                  \
+            static constexpr s32 ThreadPriority = prio;                          \
+            static constexpr size_t StackSize = ss;                              \
+            alignas(os::ThreadStackAlignment) static inline u8 Stack[StackSize]; \
+        public:                                                                  \
+            static void ThreadFunction(void *);                                  \
     }
 
-    template<class M>
+    template<class M> requires IsModule<M>
     struct ModuleTraits {
-        static_assert(std::is_base_of<ModuleBase, M>::value, "Mitm Modules must inherit from ams::mitm::Module");
-
         static constexpr void *Stack = &M::Stack[0];
         static constexpr size_t StackSize = M::StackSize;
 

stratosphere/ams_mitm/source/amsmitm_module_management.cpp

@@ -54,7 +54,7 @@ namespace ams::mitm {
                 .main = Traits::ThreadFunction,
                 .stack_mem = Traits::Stack,
                 .priority = Traits::ThreadPriority,
-                .stack_size = Traits::StackSize,
+                .stack_size = static_cast<u32>(Traits::StackSize),
             };
         }
 

stratosphere/ams_mitm/source/bpc_mitm/bpc_ams_module.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "../amsmitm_initialization.hpp"
 #include "bpc_ams_module.hpp"
 #include "bpc_ams_service.hpp"

stratosphere/ams_mitm/source/bpc_mitm/bpc_ams_power_utils.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "bpc_ams_power_utils.hpp"
 #include "../amsmitm_fs_utils.hpp"
 

stratosphere/ams_mitm/source/bpc_mitm/bpc_ams_service.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "../amsmitm_initialization.hpp"
 #include "bpc_ams_service.hpp"
 #include "bpc_ams_power_utils.hpp"

stratosphere/ams_mitm/source/bpc_mitm/bpc_mitm_service.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "bpc_mitm_service.hpp"
 #include "bpc_ams_power_utils.hpp"
 

stratosphere/ams_mitm/source/bpc_mitm/bpcmitm_module.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "../amsmitm_initialization.hpp"
 #include "bpcmitm_module.hpp"
 #include "bpc_mitm_service.hpp"

stratosphere/ams_mitm/source/fs_mitm/fs_mitm_service.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "../amsmitm_fs_utils.hpp"
 #include "../amsmitm_initialization.hpp"
 #include "fs_shim.h"

stratosphere/ams_mitm/source/fs_mitm/fsmitm_boot0storage.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "fsmitm_boot0storage.hpp"
 
 namespace ams::mitm::fs {

stratosphere/ams_mitm/source/fs_mitm/fsmitm_module.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "fsmitm_module.hpp"
 #include "fs_mitm_service.hpp"
 

stratosphere/ams_mitm/source/fs_mitm/fsmitm_romfs.cpp

@@ -40,7 +40,7 @@ namespace ams::mitm::fs {
                 s64 file_table_size;
                 s64 file_partition_ofs;
             };
-            static_assert(std::is_pod<Header>::value && sizeof(Header) == 0x50);
+            static_assert(util::is_pod<Header>::value && sizeof(Header) == 0x50);
 
             struct DirectoryEntry {
                 u32 parent;
@@ -51,7 +51,7 @@ namespace ams::mitm::fs {
                 u32 name_size;
                 char name[];
             };
-            static_assert(std::is_pod<DirectoryEntry>::value && sizeof(DirectoryEntry) == 0x18);
+            static_assert(util::is_pod<DirectoryEntry>::value && sizeof(DirectoryEntry) == 0x18);
 
             struct FileEntry {
                 u32 parent;
@@ -62,7 +62,7 @@ namespace ams::mitm::fs {
                 u32 name_size;
                 char name[];
             };
-            static_assert(std::is_pod<FileEntry>::value && sizeof(FileEntry) == 0x20);
+            static_assert(util::is_pod<FileEntry>::value && sizeof(FileEntry) == 0x20);
 
             template<typename Entry>
             class TableReader {

stratosphere/ams_mitm/source/fs_mitm/fsmitm_save_utils.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "fsmitm_save_utils.hpp"
 
 namespace ams::mitm::fs {

stratosphere/ams_mitm/source/hid_mitm/hid_mitm_service.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "hid_mitm_service.hpp"
 #include "hid_shim.h"
 

stratosphere/ams_mitm/source/hid_mitm/hidmitm_module.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "../amsmitm_initialization.hpp"
 #include "hidmitm_module.hpp"
 #include "hid_mitm_service.hpp"

stratosphere/ams_mitm/source/ns_mitm/nsmitm_module.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "../amsmitm_initialization.hpp"
 #include "nsmitm_module.hpp"
 #include "ns_am_mitm_service.hpp"

stratosphere/ams_mitm/source/set_mitm/set_mitm_service.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "set_mitm_service.hpp"
 
 namespace ams::mitm::settings {

stratosphere/ams_mitm/source/set_mitm/setmitm_module.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "../amsmitm_initialization.hpp"
 #include "setmitm_module.hpp"
 #include "set_mitm_service.hpp"

stratosphere/ams_mitm/source/set_mitm/setsys_mitm_service.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "setsys_mitm_service.hpp"
 #include "settings_sd_kvs.hpp"
 

stratosphere/ams_mitm/source/set_mitm/settings_sd_kvs.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "../amsmitm_debug.hpp"
 #include "../amsmitm_fs_utils.hpp"
 #include "settings_sd_kvs.hpp"
@@ -42,7 +43,7 @@ namespace ams::settings::fwdbg {
             }
         };
 
-        static_assert(std::is_pod<SdKeyValueStoreEntry>::value);
+        static_assert(util::is_pod<SdKeyValueStoreEntry>::value);
 
         constexpr inline bool operator==(const SdKeyValueStoreEntry &lhs, const SdKeyValueStoreEntry &rhs) {
             if (lhs.HasValue() != rhs.HasValue()) {

stratosphere/boot/Makefile

@@ -121,6 +121,8 @@ $(OUTPUT).kip	:	$(OUTPUT).elf
 
 $(OUTPUT).elf	:	$(OFILES)
 
+boot_power_utils.o: fusee_primary.bin.o fusee_primary_bin.h
+
 #---------------------------------------------------------------------------------
 # you need a rule like this for each extension you use as binary data
 #---------------------------------------------------------------------------------

stratosphere/boot/source/boot_battery_driver.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "boot_battery_driver.hpp"
 #include "boot_calibration.hpp"
 #include "boot_i2c_utils.hpp"

stratosphere/boot/source/boot_battery_icons.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "boot_battery_icons.hpp"
 #include "boot_display.hpp"
 

stratosphere/boot/source/boot_boot_reason.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "boot_boot_reason.hpp"
 #include "boot_pmic_driver.hpp"
 #include "boot_rtc_driver.hpp"

stratosphere/boot/source/boot_calibration.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "boot_calibration.hpp"
 
 namespace ams::boot {

stratosphere/boot/source/boot_change_voltage.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "boot_change_voltage.hpp"
 #include "boot_pmc_wrapper.hpp"
 

stratosphere/boot/source/boot_charger_driver.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "boot_charger_driver.hpp"
 
 namespace ams::boot {

stratosphere/boot/source/boot_check_battery.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "boot_battery_driver.hpp"
 #include "boot_battery_icons.hpp"
 #include "boot_boot_reason.hpp"

stratosphere/boot/source/boot_check_clock.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "boot_check_clock.hpp"
 #include "boot_power_utils.hpp"
 

stratosphere/boot/source/boot_clock_initial_configuration.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "boot_clock_initial_configuration.hpp"
 #include "boot_pmc_wrapper.hpp"
 #include "boot_registers_pmc.hpp"

stratosphere/boot/source/boot_display.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "boot_display.hpp"
 #include "boot_i2c_utils.hpp"
 #include "boot_pmc_wrapper.hpp"

stratosphere/boot/source/boot_fan_enable.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "boot_fan_enable.hpp"
 
 #include "gpio/gpio_utils.hpp"

stratosphere/boot/source/boot_i2c_utils.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "boot_i2c_utils.hpp"
 
 namespace ams::boot {

stratosphere/boot/source/boot_main.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "boot_boot_reason.hpp"
 #include "boot_change_voltage.hpp"
 #include "boot_check_battery.hpp"

stratosphere/boot/source/boot_pcv.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "i2c/i2c_types.hpp"
 #include "i2c/driver/impl/i2c_pcv.hpp"
 #include "i2c/driver/impl/i2c_registers.hpp"

stratosphere/boot/source/boot_pmc_wrapper.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "boot_pmc_wrapper.hpp"
 
 namespace ams::boot {

stratosphere/boot/source/boot_pmic_driver.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "boot_i2c_utils.hpp"
 #include "boot_pmic_driver.hpp"
 

stratosphere/boot/source/boot_power_utils.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "boot_power_utils.hpp"
 #include "fusee-primary_bin.h"
 

stratosphere/boot/source/boot_repair_boot_images.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "boot_power_utils.hpp"
 #include "boot_repair_boot_images.hpp"
 

stratosphere/boot/source/boot_rtc_driver.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "boot_rtc_driver.hpp"
 
 namespace ams::boot {

stratosphere/boot/source/boot_splash_screen.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "boot_boot_reason.hpp"
 #include "boot_display.hpp"
 #include "boot_splash_screen.hpp"

stratosphere/boot/source/boot_wake_pins.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "boot_pmc_wrapper.hpp"
 #include "boot_wake_pins.hpp"
 

stratosphere/boot/source/gpio/gpio_initial_configuration.cpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <stratosphere/spl.hpp>
-
+#include <stratosphere.hpp>
 #include "gpio_initial_configuration.hpp"
 #include "gpio_utils.hpp"
 

stratosphere/boot/source/gpio/gpio_utils.cpp

@@ -13,9 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <stratosphere/reg.hpp>
-
+#include <stratosphere.hpp>
 #include "gpio_utils.hpp"
 
 namespace ams::gpio {

stratosphere/boot/source/i2c/driver/i2c_api.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "i2c_api.hpp"
 #include "impl/i2c_resource_manager.hpp"
 

stratosphere/boot/source/i2c/driver/impl/i2c_bus_accessor.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "i2c_pcv.hpp"
 #include "i2c_bus_accessor.hpp"
 

stratosphere/boot/source/i2c/driver/impl/i2c_device_config.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "i2c_driver_types.hpp"
 
 namespace ams::i2c::driver::impl {

stratosphere/boot/source/i2c/driver/impl/i2c_resource_manager.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "i2c_pcv.hpp"
 #include "i2c_resource_manager.hpp"
 

stratosphere/boot/source/i2c/driver/impl/i2c_session.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "i2c_session.hpp"
 
 namespace ams::i2c::driver::impl {

stratosphere/boot/source/i2c/i2c_command_list.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "i2c_types.hpp"
 #include "i2c_command_list.hpp"
 

stratosphere/boot/source/pinmux/pinmux_initial_configuration.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "pinmux_initial_configuration.hpp"
 #include "pinmux_utils.hpp"
 

stratosphere/boot/source/pinmux/pinmux_utils.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "pinmux_utils.hpp"
 
 namespace ams::pinmux {

stratosphere/boot2/source/boot2_main.cpp

@@ -102,5 +102,7 @@ int main(int argc, char **argv)
 
     /* Launch all programs off of SYSTEM/the SD. */
     boot2::LaunchPostSdCardBootPrograms();
+
+    return 0;
 }
 

stratosphere/creport/source/creport_crash_report.cpp

@@ -13,8 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <sys/stat.h>
-#include <sys/types.h>
+#include <stratosphere.hpp>
 #include "creport_crash_report.hpp"
 #include "creport_utils.hpp"
 
@@ -351,7 +350,7 @@ namespace ams::creport {
     }
 
     void CrashReport::SaveToFile(ScopedFile &file) {
-        file.WriteFormat(u8"Atmosphère Crash Report (v1.5):\n");
+        file.WriteFormat("Atmosphère Crash Report (v1.5):\n");
         file.WriteFormat("Result:                          0x%X (2%03d-%04d)\n\n", this->result.GetValue(), this->result.GetModule(), this->result.GetDescription());
 
         /* Process Info. */

stratosphere/creport/source/creport_main.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "creport_crash_report.hpp"
 #include "creport_utils.hpp"
 

stratosphere/creport/source/creport_modules.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "creport_modules.hpp"
 #include "creport_utils.hpp"
 

stratosphere/creport/source/creport_scoped_file.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "creport_scoped_file.hpp"
 
 namespace ams::creport {

stratosphere/creport/source/creport_threads.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "creport_threads.hpp"
 #include "creport_modules.hpp"
 

stratosphere/creport/source/creport_utils.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "creport_utils.hpp"
 
 namespace ams::creport {

stratosphere/dmnt/source/cheat/dmnt_cheat_service.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "dmnt_cheat_service.hpp"
 #include "impl/dmnt_cheat_api.hpp"
 

stratosphere/dmnt/source/cheat/impl/dmnt_cheat_api.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "dmnt_cheat_api.hpp"
 #include "dmnt_cheat_vm.hpp"
 #include "dmnt_cheat_debug_events_manager.hpp"
@@ -141,7 +142,7 @@ namespace ams::dmnt::cheat::impl {
                         }
 
                         /* Clear metadata. */
-                        static_assert(std::is_pod<decltype(this->cheat_process_metadata)>::value, "CheatProcessMetadata definition!");
+                        static_assert(util::is_pod<decltype(this->cheat_process_metadata)>::value, "CheatProcessMetadata definition!");
                         std::memset(&this->cheat_process_metadata, 0, sizeof(this->cheat_process_metadata));
 
                         /* Clear cheat list. */

stratosphere/dmnt/source/cheat/impl/dmnt_cheat_debug_events_manager.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "dmnt_cheat_debug_events_manager.hpp"
 
 /* WORKAROUND: This design prevents a kernel deadlock from occurring on 6.0.0+ */

stratosphere/dmnt/source/cheat/impl/dmnt_cheat_vm.cpp

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <sys/stat.h>
+#include <stratosphere.hpp>
 #include "dmnt_cheat_vm.hpp"
 #include "dmnt_cheat_api.hpp"
 

stratosphere/dmnt/source/dmnt_main.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "dmnt_service.hpp"
 #include "cheat/dmnt_cheat_service.hpp"
 #include "cheat/impl/dmnt_cheat_api.hpp"

stratosphere/dmnt/source/dmnt_service.hpp

@@ -55,7 +55,7 @@ namespace ams::dmnt {
         }
     };
 
-    static_assert(std::is_pod<TargetIOFileHandle>::value && sizeof(TargetIOFileHandle) == sizeof(u64), "TargetIOFileHandle");
+    static_assert(util::is_pod<TargetIOFileHandle>::value && sizeof(TargetIOFileHandle) == sizeof(u64), "TargetIOFileHandle");
 
     class DebugMonitorService final : public sf::IServiceObject {
         private:

stratosphere/dmnt/source/dmnt_service_debug.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "dmnt_service.hpp"
 
 namespace ams::dmnt {

stratosphere/dmnt/source/dmnt_service_target_io.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "dmnt_service.hpp"
 
 namespace std {

stratosphere/fatal/source/fatal_config.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "fatal_config.hpp"
 
 namespace ams::fatal::srv {
@@ -77,21 +78,21 @@ namespace ams::fatal::srv {
 
         /* Setup messages. */
         {
-            this->error_msg = u8"Error Code: 2%03d-%04d (0x%x)\n";
+            this->error_msg = "Error Code: 2%03d-%04d (0x%x)\n";
 
-            this->error_desc = u8"An error has occured.\n\n"
-                                 u8"Please press the POWER Button to restart the console normally, or a VOL button\n"
-                                 u8"to reboot to a payload (or RCM, if none is present). If you are unable to\n"
-                                 u8"restart the console, hold the POWER Button for 12 seconds to turn the console off.\n\n"
-                                 u8"If the problem persists, refer to the Nintendo Support Website.\n"
-                                 u8"support.nintendo.com/switch/error\n";
+            this->error_desc = "An error has occured.\n\n"
+                                 "Please press the POWER Button to restart the console normally, or a VOL button\n"
+                                 "to reboot to a payload (or RCM, if none is present). If you are unable to\n"
+                                 "restart the console, hold the POWER Button for 12 seconds to turn the console off.\n\n"
+                                 "If the problem persists, refer to the Nintendo Support Website.\n"
+                                 "support.nintendo.com/switch/error\n";
 
             /* If you're running Atmosphere on a quest unit for some reason, talk to me on discord. */
-            this->quest_desc = u8"Please call 1-800-875-1852 for service.\n\n"
-                                 u8"Also, please be aware that running Atmosphere on a Quest device is not fully\n"
-                                 u8"supported. Perhaps try booting your device without Atmosphere before calling\n"
-                                 u8"an official Nintendo service hotline. If you encounter further issues, please\n"
-                                 u8"contact SciresM#0524 on Discord, or via some other means.\n";
+            this->quest_desc = "Please call 1-800-875-1852 for service.\n\n"
+                                "Also, please be aware that running Atmosphere on a Quest device is not fully\n"
+                                "supported. Perhaps try booting your device without Atmosphere before calling\n"
+                                "an official Nintendo service hotline. If you encounter further issues, please\n"
+                                "contact SciresM#0524 on Discord, or via some other means.\n";
 
             /* TODO: Try to load dynamically? */
             /* FsStorage message_storage; */

stratosphere/fatal/source/fatal_debug.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "fatal_debug.hpp"
 #include "fatal_config.hpp"
 

stratosphere/fatal/source/fatal_event_manager.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "fatal_event_manager.hpp"
 
 namespace ams::fatal::srv {

stratosphere/fatal/source/fatal_font.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "fatal_config.hpp"
 #include "fatal_font.hpp"
 

stratosphere/fatal/source/fatal_main.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "fatal_service.hpp"
 #include "fatal_config.hpp"
 #include "fatal_repair.hpp"

stratosphere/fatal/source/fatal_repair.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "fatal_repair.hpp"
 #include "fatal_service_for_self.hpp"
 

stratosphere/fatal/source/fatal_scoped_file.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "fatal_scoped_file.hpp"
 
 namespace ams::fatal::srv {

stratosphere/fatal/source/fatal_service.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "fatal_config.hpp"
 #include "fatal_debug.hpp"
 #include "fatal_service.hpp"

stratosphere/fatal/source/fatal_task.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "fatal_task.hpp"
 
 #include "fatal_task_error_report.hpp"

stratosphere/fatal/source/fatal_task_clock.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "fatal_task_clock.hpp"
 
 namespace ams::fatal::srv {

stratosphere/fatal/source/fatal_task_error_report.cpp

@@ -13,8 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <sys/stat.h>
-#include <sys/types.h>
+#include <stratosphere.hpp>
 #include "fatal_config.hpp"
 #include "fatal_task_error_report.hpp"
 #include "fatal_scoped_file.hpp"
@@ -79,13 +78,13 @@ namespace ams::fatal::srv {
                 std::snprintf(file_path, sizeof(file_path) - 1, "sdmc:/atmosphere/fatal_reports/%011lu_%016lx.log", timestamp, static_cast<u64>(this->context->program_id));
                 ScopedFile file(file_path);
                 if (file.IsOpen()) {
-                    file.WriteFormat(u8"Atmosphère Fatal Report (v1.1):\n");
+                    file.WriteFormat("Atmosphère Fatal Report (v1.1):\n");
                     file.WriteFormat("Result:                          0x%X (2%03d-%04d)\n\n", this->context->result.GetValue(), this->context->result.GetModule(), this->context->result.GetDescription());
                     file.WriteFormat("Program ID:                      %016lx\n", static_cast<u64>(this->context->program_id));
                     if (strlen(this->context->proc_name)) {
                         file.WriteFormat("Process Name:                    %s\n", this->context->proc_name);
                     }
-                    file.WriteFormat(u8"Firmware:                        %s (Atmosphère %u.%u.%u-%s)\n", GetFatalConfig().GetFirmwareVersion().display_version, ATMOSPHERE_RELEASE_VERSION, ams::GetGitRevision());
+                    file.WriteFormat("Firmware:                        %s (Atmosphère %u.%u.%u-%s)\n", GetFatalConfig().GetFirmwareVersion().display_version, ATMOSPHERE_RELEASE_VERSION, ams::GetGitRevision());
 
                     if (this->context->cpu_ctx.architecture == CpuContext::Architecture_Aarch32) {
                         file.WriteFormat("General Purpose Registers:\n");

stratosphere/fatal/source/fatal_task_power.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "fatal_config.hpp"
 #include "fatal_task_power.hpp"
 

stratosphere/fatal/source/fatal_task_screen.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "fatal_task_screen.hpp"
 #include "fatal_config.hpp"
 #include "fatal_font.hpp"
@@ -213,18 +214,18 @@ namespace ams::fatal::srv {
             font::AddSpacingLines(0.5f);
             font::PrintFormatLine(  "Program:  %016lX", static_cast<u64>(this->context->program_id));
             font::AddSpacingLines(0.5f);
-            font::PrintFormatLine(u8"Firmware: %s (Atmosphère %u.%u.%u-%s)", config.GetFirmwareVersion().display_version, ATMOSPHERE_RELEASE_VERSION, ams::GetGitRevision());
+            font::PrintFormatLine("Firmware: %s (Atmosphère %u.%u.%u-%s)", config.GetFirmwareVersion().display_version, ATMOSPHERE_RELEASE_VERSION, ams::GetGitRevision());
             font::AddSpacingLines(1.5f);
             if (!exosphere::ResultVersionMismatch::Includes(this->context->result)) {
                 font::Print(config.GetErrorDescription());
             } else {
                 /* Print a special message for atmosphere version mismatch. */
-                font::Print(u8"Atmosphère version mismatch detected.\n\n"
-                                   u8"Please press the POWER Button to restart the console normally, or a VOL button\n"
-                                   u8"to reboot to a payload (or RCM, if none is present). If you are unable to\n"
-                                   u8"restart the console, hold the POWER Button for 12 seconds to turn the console off.\n\n"
-                                   u8"Please ensure that all Atmosphère components are updated.\n"
-                                   u8"github.com/Atmosphere-NX/Atmosphere/releases\n");
+                font::Print("Atmosphère version mismatch detected.\n\n"
+                                   "Please press the POWER Button to restart the console normally, or a VOL button\n"
+                                   "to reboot to a payload (or RCM, if none is present). If you are unable to\n"
+                                   "restart the console, hold the POWER Button for 12 seconds to turn the console off.\n\n"
+                                   "Please ensure that all Atmosphère components are updated.\n"
+                                   "github.com/Atmosphere-NX/Atmosphere/releases\n");
             }
 
             /* Add a line. */

stratosphere/fatal/source/fatal_task_sound.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "fatal_task_sound.hpp"
 
 namespace ams::fatal::srv {

stratosphere/loader/source/ldr_arguments.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "ldr_arguments.hpp"
 
 namespace ams::ldr::args {

stratosphere/loader/source/ldr_capabilities.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "ldr_capabilities.hpp"
 
 namespace ams::ldr::caps {

stratosphere/loader/source/ldr_content_management.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "ldr_content_management.hpp"
 
 namespace ams::ldr {

stratosphere/loader/source/ldr_development_manager.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "ldr_launch_record.hpp"
 
 namespace ams::ldr {

stratosphere/loader/source/ldr_launch_record.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "ldr_launch_record.hpp"
 
 namespace ams::ldr {

stratosphere/loader/source/ldr_loader_service.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "ldr_arguments.hpp"
 #include "ldr_content_management.hpp"
 #include "ldr_development_manager.hpp"

stratosphere/loader/source/ldr_main.cpp

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
+#include <stratosphere.hpp>
 #include "ldr_development_manager.hpp"
 #include "ldr_loader_service.hpp"
 

stratosphere/loader/source/ldr_meta.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "ldr_capabilities.hpp"
 #include "ldr_content_management.hpp"
 #include "ldr_development_manager.hpp"

stratosphere/loader/source/ldr_patcher.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "ldr_patcher.hpp"
 
 namespace ams::ldr {

stratosphere/loader/source/ldr_ro_manager.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "ldr_ro_manager.hpp"
 
 namespace ams::ldr::ro {

stratosphere/ncm/source/ncm_main.cpp

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include <stratosphere.hpp>
 
 extern "C" {

stratosphere/pgl/source/pgl_main.cpp

@@ -64,7 +64,7 @@ namespace ams::pgl {
         constexpr sm::ServiceName ShellServiceName = sm::ServiceName::Encode("pgl");
         constexpr size_t          ShellMaxSessions = 8; /* Official maximum is 8. */
 
-        /* TODO: C++20 constinit */ pgl::srv::ShellInterface g_shell_interface;
+        constinit pgl::srv::ShellInterface g_shell_interface;
 
         ALWAYS_INLINE std::shared_ptr<pgl::srv::ShellInterface> GetSharedPointerToShellInterface() {
             return ams::sf::ServiceObjectTraits<pgl::srv::ShellInterface>::SharedPointerHelper::GetEmptyDeleteSharedPointer(std::addressof(g_shell_interface));

stratosphere/pm/source/impl/pm_process_info.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "pm_process_info.hpp"
 
 namespace ams::pm::impl {

stratosphere/pm/source/impl/pm_process_manager.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "pm_process_manager.hpp"
 #include "pm_resource_manager.hpp"
 

stratosphere/pm/source/impl/pm_resource_manager.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "pm_resource_manager.hpp"
 
 namespace ams::pm::resource {

stratosphere/pm/source/pm_boot_mode_service.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "pm_boot_mode_service.hpp"
 
 namespace ams::pm::bm {

stratosphere/pm/source/pm_debug_monitor_service.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "pm_debug_monitor_service.hpp"
 #include "impl/pm_process_manager.hpp"
 

stratosphere/pm/source/pm_info_service.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "pm_info_service.hpp"
 #include "impl/pm_process_manager.hpp"
 

stratosphere/pm/source/pm_main.cpp

@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stratosphere.hpp>
 #include "pm_boot_mode_service.hpp"
 #include "pm_debug_monitor_service.hpp"
 #include "pm_info_service.hpp"