exo2: Initial work on the exosphere rewrite.

exo2: Implement uncompressor stub and boot code up to Main().

exo2: implement some more init (uart/gic)

exo2: implement more of init

exo2: improve reg api, add keyslot flag setters

exo2: implement se aes decryption/enc

exo2: fix bugs in loader stub/mmu mappings

exo2: start skeletoning bootconfig/global context types

arch: fix makefile flags

exo2: implement through master key derivation

exo2: implement device master keygen

exo2: more init through start of SetupSocSecurity

exo2: implement pmc secure scratch management

se: implement sticky bit validation

libexosphere: fix building for arm32

libexo: fix makefile flags

libexo: support building for arm64/arm

sc7fw: skeleton binary

sc7fw: skeleton a little more

sc7fw: implement all non-dram functionality

exo2: fix DivideUp error

sc7fw: implement more dram code, fix reg library errors

sc7fw: complete sc7fw impl.

exo2: skeleton the rest of SetupSocSecurity

exo2: implement fiq interrupt handler

exo2: implement all exception handlers

exo2: skeleton the entire smc api, implement the svc invoker

exo2: implement rest of SetupSocSecurity

exo2: correct slave security errors

exo2: fix register definition

exo2: minor fixes

libraries/libvapours/include/vapours/assert.hpp

@@ -32,6 +32,7 @@ namespace ams::diag {
 
     NORETURN NOINLINE void AbortImpl(const char *file, int line, const char *func, const char *expr, u64 value, const char *format, ...) __attribute__((format(printf, 6, 7)));
     NORETURN NOINLINE void AbortImpl(const char *file, int line, const char *func, const char *expr, u64 value);
+    NORETURN NOINLINE void AbortImpl();
 
 }
 
@@ -42,7 +43,7 @@ namespace ams::diag {
 #define AMS_CALL_ABORT_IMPL(cond, ...)  ::ams::diag::AbortImpl(__FILE__, __LINE__, __PRETTY_FUNCTION__, cond, 0, ## __VA_ARGS__)
 #else
 #define AMS_CALL_ASSERT_FAIL_IMPL(cond, ...) ::ams::diag::AssertionFailureImpl("", 0, "", "", 0)
-#define AMS_CALL_ABORT_IMPL(cond, ...)  ::ams::diag::AbortImpl("", 0, "", "", 0)
+#define AMS_CALL_ABORT_IMPL(cond, ...)  ::ams::diag::AbortImpl()
 #endif
 
 #ifdef AMS_ENABLE_ASSERTIONS

libraries/libvapours/include/vapours/crypto/impl/crypto_ctr_mode_impl.hpp

@@ -142,7 +142,7 @@ namespace ams::crypto::impl {
                 u64 _block[IvSize / sizeof(u64)] = {};
                 util::StoreBigEndian(std::addressof(_block[(IvSize / sizeof(u64)) - 1]), count);
 
-                u16 acc;
+                u16 acc = 0;
                 const u8 *block = reinterpret_cast<const u8 *>(_block);
                 for (s32 i = IvSize - 1; i >= 0; --i) {
                     acc += (this->counter[i] + block[i]);

libraries/libvapours/include/vapours/defines.hpp

@@ -59,4 +59,6 @@
 #define AMS_LIKELY(expr)   AMS_PREDICT_TRUE(expr, 1.0)
 #define AMS_UNLIKELY(expr) AMS_PREDICT_FALSE(expr, 1.0)
 
+#define AMS_ASSUME(expr) do { if (!static_cast<bool>((expr))) { __builtin_unreachable(); } } while (0)
+
 #define AMS_CURRENT_FUNCTION_NAME __FUNCTION__

libraries/libvapours/include/vapours/literals.hpp

@@ -19,16 +19,16 @@
 
 namespace ams { inline namespace literals {
 
-    constexpr ALWAYS_INLINE size_t operator ""_KB(unsigned long long n) {
-        return static_cast<size_t>(n) * size_t(1024);
+    constexpr ALWAYS_INLINE u64 operator ""_KB(unsigned long long n) {
+        return static_cast<u64>(n) * UINT64_C(1024);
     }
 
-    constexpr ALWAYS_INLINE size_t operator ""_MB(unsigned long long n) {
-        return operator ""_KB(n) * size_t(1024);
+    constexpr ALWAYS_INLINE u64 operator ""_MB(unsigned long long n) {
+        return operator ""_KB(n) * UINT64_C(1024);
     }
 
-    constexpr ALWAYS_INLINE size_t operator ""_GB(unsigned long long n) {
-        return operator ""_MB(n) * size_t(1024);
+    constexpr ALWAYS_INLINE u64 operator ""_GB(unsigned long long n) {
+        return operator ""_MB(n) * UINT64_C(1024);
     }
 
 } }

libraries/libvapours/include/vapours/svc/arch/arm/svc_thread_local_region.hpp

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2018-2020 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 <vapours/svc/svc_types_common.hpp>
+
+namespace ams::svc::arch::arm {
+
+    constexpr inline size_t NumTlsSlots = 16;
+    constexpr inline size_t MessageBufferSize = 0x100;
+
+    struct ThreadLocalRegion {
+        u32 message_buffer[MessageBufferSize / sizeof(u32)];
+        volatile u16 disable_count;
+        volatile u16 interrupt_flag;
+        /* TODO: Should we bother adding the Nintendo aarch32 thread local context here? */
+        uintptr_t TODO[(0x200 - 0x104) / sizeof(uintptr_t)];
+    };
+
+    ALWAYS_INLINE ThreadLocalRegion *GetThreadLocalRegion() {
+        ThreadLocalRegion *tlr;
+        __asm__ __volatile__("mrc p15, 0, %[tlr], c13, c0, 3" : [tlr]"=&r"(tlr) :: "memory");
+        return tlr;
+    }
+
+}

libraries/libvapours/include/vapours/svc/svc_select_thread_local_region.hpp

@@ -25,6 +25,14 @@
         using ams::svc::arch::arm64::GetThreadLocalRegion;
     }
 
+#elif defined(ATMOSPHERE_ARCH_ARM)
+
+    #include <vapours/svc/arch/arm/svc_thread_local_region.hpp>
+    namespace ams::svc {
+        using ams::svc::arch::arm::ThreadLocalRegion;
+        using ams::svc::arch::arm::GetThreadLocalRegion;
+    }
+
 #else
 
     #error "Unknown architecture for svc::ThreadLocalRegion"

libraries/libvapours/include/vapours/svc/svc_types_common.hpp

@@ -225,7 +225,7 @@ namespace ams::svc {
     /* Thread types. */
     using ThreadFunc = ams::svc::Address;
 
-#ifdef ATMOSPHERE_ARCH_ARM64
+#if defined(ATMOSPHERE_ARCH_ARM64)
 
     struct ThreadContext {
         u64  r[29];
@@ -242,8 +242,23 @@ namespace ams::svc {
     };
     static_assert(sizeof(ThreadContext) == 0x320);
 
+#elif defined(ATMOSPHERE_ARCH_ARM)
+
+    struct ThreadContext {
+        u32 r[13];
+        u32 sp;
+        u32 lr;
+        u32 pc;
+        u32 cpsr;
+        u32 padding;
+        u64 fpu_registers[32];
+        u32 fpscr;
+        u32 fpexc;
+        u32 tpidr;
+    };
+
 #else
-    #error >Unknown Architecture for ams::svc::ThreadContext>
+    #error "Unknown Architecture for ams::svc::ThreadContext"
 #endif
 
     enum ThreadSuspend : u32 {

libraries/libvapours/include/vapours/types.hpp

@@ -25,25 +25,28 @@ typedef uint8_t u8;       ///<   8-bit unsigned integer.
 typedef uint16_t u16;     ///<  16-bit unsigned integer.
 typedef uint32_t u32;     ///<  32-bit unsigned integer.
 typedef uint64_t u64;     ///<  64-bit unsigned integer.
-typedef __uint128_t u128; ///< 128-bit unsigned integer.
 
 typedef int8_t s8;       ///<   8-bit signed integer.
 typedef int16_t s16;     ///<  16-bit signed integer.
 typedef int32_t s32;     ///<  32-bit signed integer.
 typedef int64_t s64;     ///<  64-bit signed integer.
-typedef __int128_t s128; ///< 128-bit unsigned integer.
 
 typedef volatile u8 vu8;     ///<   8-bit volatile unsigned integer.
 typedef volatile u16 vu16;   ///<  16-bit volatile unsigned integer.
 typedef volatile u32 vu32;   ///<  32-bit volatile unsigned integer.
 typedef volatile u64 vu64;   ///<  64-bit volatile unsigned integer.
-typedef volatile u128 vu128; ///< 128-bit volatile unsigned integer.
 
 typedef volatile s8 vs8;     ///<   8-bit volatile signed integer.
 typedef volatile s16 vs16;   ///<  16-bit volatile signed integer.
 typedef volatile s32 vs32;   ///<  32-bit volatile signed integer.
 typedef volatile s64 vs64;   ///<  64-bit volatile signed integer.
+
+#ifdef ATMOSPHERE_ARCH_ARM64
+typedef __uint128_t u128; ///< 128-bit unsigned integer.
+typedef __int128_t s128; ///< 128-bit unsigned integer.
+typedef volatile u128 vu128; ///< 128-bit volatile unsigned integer.
 typedef volatile s128 vs128; ///< 128-bit volatile signed integer.
+#endif
 
 typedef u32 Result;          ///< Function error code result type.
 

libraries/libvapours/include/vapours/util.hpp

@@ -21,6 +21,7 @@
 #include <vapours/util/util_type_traits.hpp>
 #include <vapours/util/util_alignment.hpp>
 #include <vapours/util/util_size.hpp>
+#include <vapours/util/util_aligned_buffer.hpp>
 #include <vapours/util/util_endian.hpp>
 #include <vapours/util/util_scope_guard.hpp>
 #include <vapours/util/util_specialization_of.hpp>

libraries/libvapours/include/vapours/util/util_aligned_buffer.hpp

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2018-2020 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 <vapours/common.hpp>
+#include <vapours/assert.hpp>
+#include <vapours/util/util_alignment.hpp>
+
+namespace ams::util {
+
+    template<size_t Alignment, size_t Size>
+    class AlignedBuffer {
+        private:
+            static constexpr size_t AlignedSize = ((Size + Alignment - 1) / Alignment) * Alignment;
+            static_assert(AlignedSize % Alignment == 0);
+        private:
+            u8 buffer[Alignment + AlignedSize];
+        public:
+            ALWAYS_INLINE operator u8 *() { return reinterpret_cast<u8 *>(util::AlignUp(reinterpret_cast<uintptr_t>(this->buffer), Alignment)); }
+    };
+
+}

libraries/libvapours/include/vapours/util/util_bitpack.hpp

@@ -42,7 +42,7 @@ namespace ams::util {
                     }
                 }();
             public:
-                template<size_t _Index, size_t _Count, typename T>
+                template<size_t _Index, size_t _Count, typename T = IntegralStorageType>
                 struct Field {
                     using Type = T;
                     static constexpr size_t Index = _Index;

libraries/libvapours/include/vapours/util/util_endian.hpp

@@ -135,21 +135,21 @@ namespace ams::util {
     }
 
     template<typename T> requires std::integral<T>
-    constexpr ALWAYS_INLINE T LoadBigEndian(T *ptr) {
+    constexpr ALWAYS_INLINE T LoadBigEndian(const T *ptr) {
         return ConvertToBigEndian(*ptr);
     }
 
     template<typename T> requires std::integral<T>
-    constexpr ALWAYS_INLINE T LoadLittleEndian(T *ptr) {
+    constexpr ALWAYS_INLINE T LoadLittleEndian(const T *ptr) {
         return ConvertToLittleEndian(*ptr);
     }
 
-    template<typename T>
+    template<typename T> requires std::integral<T>
     constexpr ALWAYS_INLINE void StoreBigEndian(T *ptr, T val) {
         *ptr = ConvertToBigEndian(val);
     }
 
-    template<typename T>
+    template<typename T> requires std::integral<T>
     constexpr ALWAYS_INLINE void StoreLittleEndian(T *ptr, T val) {
         *ptr = ConvertToLittleEndian(val);
     }

libraries/libvapours/include/vapours/util/util_tinymt.hpp

@@ -242,7 +242,7 @@ namespace ams::util {
                 const u32 first  = (this->GenerateRandomU32() >> Shift1st);
                 const u32 second = (this->GenerateRandomU32() >> Shift2nd);
 
-                return (1.0 * first * (1ul << (32 - Shift2nd)) + second) * (1.0 / (1ul << MantissaBits));
+                return (1.0 * first * (static_cast<u64>(1) << (32 - Shift2nd)) + second) * (1.0 / (static_cast<u64>(1) << MantissaBits));
             }
     };