2026-09-06 20:57:36

Signed-off-by: lizzie <lizzie@eden-emu.dev>

src/core/arm/symbols.cpp

@@ -17,26 +17,25 @@ namespace Core {
 namespace Symbols {
 
 struct ModuleHeaderLocation {
-    u32_le version;
-    u32_le header_offset;
-    u32_le version_offset;
+    u32 version;
+    u32 header_offset;
+    u32 version_offset;
 };
 static_assert(sizeof(ModuleHeaderLocation) == 0x0C);
 struct ModuleHeader {
-    u32_le signature;
-    u32_le dynamic_offset;
-    u32_le bss_start_offset;
-    u32_le bss_end_offset;
-    // https://github.com/Atmosphere-NX/Atmosphere/pull/2835/changes
-    s32_le exception_info_start_offset;
-    s32_le exception_info_end_offset;
-    u32_le module_offset;
-    u32_le relro_start_offset;
-    u32_le full_relro_end_offset;
-    u32_le nx_debug_link_start_offset;
-    u32_le nx_debug_link_end_offset;
-    u32_le note_gnu_build_id_start_offset;
-    u32_le note_gnu_build_id_end_offset;
+    u32 signature;
+    u32 dynamic_offset;
+    u32 bss_start_offset;
+    u32 bss_end_offset;
+    u32 exception_info_start_offset;
+    u32 exception_info_end_offset;
+    u32 module_offset;
+    u32 relro_start_offset;
+    u32 full_relro_end_offset;
+    u32 nx_debug_link_start_offset;
+    u32 nx_debug_link_end_offset;
+    u32 note_gnu_build_id_start_offset;
+    u32 note_gnu_build_id_end_offset;
 };
 static_assert(sizeof(ModuleHeader) == 0x34);
 

src/core/loader/nro.cpp

@@ -63,9 +63,8 @@ struct ModHeader {
     u32_le dynamic_offset;
     u32_le bss_start_offset;
     u32_le bss_end_offset;
-    // https://github.com/Atmosphere-NX/Atmosphere/pull/2835/changes
-    s32_le unwind_start_offset;
-    s32_le unwind_end_offset;
+    u32_le unwind_start_offset;
+    u32_le unwind_end_offset;
     u32_le module_offset; // Offset to runtime-generated module object. typically equal to .bss base
 };
 static_assert(sizeof(ModHeader) == 0x1c, "ModHeader has incorrect size.");

src/core/loader/nso.cpp

@@ -35,9 +35,8 @@ struct MODHeader {
     u32_le dynamic_offset;
     u32_le bss_start_offset;
     u32_le bss_end_offset;
-    // https://github.com/Atmosphere-NX/Atmosphere/pull/2835/changes
-    s32_le eh_frame_hdr_start_offset;
-    s32_le eh_frame_hdr_end_offset;
+    u32_le eh_frame_hdr_start_offset;
+    u32_le eh_frame_hdr_end_offset;
     u32_le module_offset; // Offset to runtime-generated module object. typically equal to .bss base
 };
 static_assert(sizeof(MODHeader) == 0x1c, "MODHeader has incorrect size.");

src/dynarmic/tests/A32/fuzz_arm.cpp

@@ -321,8 +321,6 @@ static void RunTestInstance(Dynarmic::A32::Jit& jit,
     uni_env.PadCodeMem();
     jit_env.modified_memory.clear();
     uni_env.modified_memory.clear();
-    jit_env.interrupts.clear();
-    uni_env.interrupts.clear();
 
     jit.Regs() = regs;
     jit.ExtRegs() = vecs;

src/dynarmic/tests/A64/fuzz_with_unicorn.cpp

@@ -176,8 +176,6 @@ static void RunTestInstance(Dynarmic::A64::Jit& jit, A64Unicorn& uni, A64TestEnv
     uni_env.code_mem_start_address = instructions_start;
     jit_env.modified_memory.clear();
     uni_env.modified_memory.clear();
-    jit_env.interrupts.clear();
-    uni_env.interrupts.clear();
 
     const u64 initial_sp = RandInt<u64>(0x30'0000'0000, 0x40'0000'0000) * 4;
 

src/dynarmic/tests/print_info.cpp

@@ -282,20 +282,17 @@ int main(int argc, char** argv) {
         return 1;
     }
 
-    const char* const hex_instruction = [argv] {
-        if (strlen(argv[2]) > 2 && argv[2][0] == '0' && argv[2][1] == 'x') {
-            return argv[2] + 2;
-        }
-        return argv[2];
+    const char* const hex_instruction = [s = argv[2]] {
+        if (strlen(s) > 2 && s[0] == '0' && s[1] == 'x')
+            return s + 2;
+        return s;
     }();
-
     if (strlen(hex_instruction) > 8) {
         fmt::print("hex string too long\n");
         return 1;
     }
 
     const u32 instruction = strtol(hex_instruction, nullptr, 16);
-
     if (strcmp(argv[1], "a32") == 0) {
         PrintA32Instruction(instruction);
     } else if (strcmp(argv[1], "a64") == 0) {
@@ -306,13 +303,11 @@ int main(int argc, char** argv) {
         fmt::print("Invalid mode: {}\nValid values: a32, a64, thumb\n", argv[1]);
         return 1;
     }
-
     if (argc == 4) {
         if (strcmp(argv[3], "-exec") != 0) {
             fmt::print("Invalid option {}\n", argv[3]);
             return 1;
         }
-
         if (strcmp(argv[1], "a32") == 0) {
             ExecuteA32Instruction(instruction);
         } else {
@@ -320,6 +315,5 @@ int main(int argc, char** argv) {
             return 1;
         }
     }
-
     return 0;
 }

src/dynarmic/tests/test_generator.cpp

@@ -354,6 +354,8 @@ u32 GenRandomA64Inst(u64 pc, bool is_last_inst) {
             "MSR_reg",
             "MSR_imm",
             "MRS",
+            // generates F16
+            "FCADD_vec",
         };
 
         for (const auto& [fn, bitstring] : list) {
@@ -440,7 +442,6 @@ void RunTestInstance(Dynarmic::A32::Jit& jit,
         std::copy(instructions.begin(), instructions.end(), jit_env.code_mem.begin() + num_words);
         jit_env.PadCodeMem();
         jit_env.modified_memory.clear();
-        jit_env.interrupts.clear();
 
         jit.Regs() = regs;
         jit.ExtRegs() = vecs;
@@ -510,7 +511,6 @@ void RunTestInstance(Dynarmic::A64::Jit& jit,
         jit_env.code_mem.emplace_back(0x14000000);  // B .
         jit_env.code_mem_start_address = start_address;
         jit_env.modified_memory.clear();
-        jit_env.interrupts.clear();
 
         jit.SetRegisters(regs);
         jit.SetVectors(vecs);
@@ -536,36 +536,52 @@ void RunTestInstance(Dynarmic::A64::Jit& jit,
         fmt::print("initial_regs:");
         for (u64 i : regs)
             fmt::print(" {:016x}", i);
-        fmt::print("\n");
-        fmt::print("initial_vecs:");
+        fmt::print(
+            "\n"
+            "initial_vecs:"
+        );
         for (auto i : vecs)
             fmt::print(" {:016x}:{:016x}", i[0], i[1]);
-        fmt::print("\n");
-        fmt::print("initial_sp: {:016x}\n", initial_sp);
-        fmt::print("initial_pstate: {:08x}\n", pstate);
-        fmt::print("initial_fpcr: {:08x}\n", fpcr);
-        fmt::print("final_regs:");
+        fmt::print(
+            "\n"
+            "initial_sp: {:016x}\n"
+            "initial_pstate: {:08x}\n"
+            "initial_fpcr: {:08x}\n"
+            "final_regs:"
+            , initial_sp
+            , pstate
+            , fpcr
+        );
         for (u64 i : jit.GetRegisters())
             fmt::print(" {:016x}", i);
-        fmt::print("\n");
-        fmt::print("final_vecs:");
+        fmt::print(
+            "\n"
+            "final_vecs:"
+        );
         for (auto i : jit.GetVectors())
             fmt::print(" {:016x}:{:016x}", i[0], i[1]);
-        fmt::print("\n");
-        fmt::print("final_sp: {:016x}\n", jit.GetSP());
-        fmt::print("final_pc: {:016x}\n", jit.GetPC());
-        fmt::print("final_pstate: {:08x}\n", jit.GetPstate());
-        fmt::print("final_fpcr: {:08x}\n", jit.GetFpcr());
-        fmt::print("final_qc : {}\n", FP::FPSR{jit.GetFpsr()}.QC());
-        fmt::print("mod_mem:");
+        fmt::print(
+            "\n"
+            "final_sp: {:016x}\n"
+            "final_pc: {:016x}\n"
+            "final_pstate: {:08x}\n"
+            "final_fpcr: {:08x}\n"
+            "final_qc : {}\n"
+            "mod_mem:"
+            , jit.GetSP()
+            , jit.GetPC()
+            , jit.GetPstate()
+            , jit.GetFpcr()
+            , FP::FPSR{jit.GetFpsr()}.QC()
+        );
         for (auto [addr, value] : jit_env.modified_memory)
             fmt::print(" {:08x}:{:02x}", addr, value);
-        fmt::print("\n");
-        fmt::print("interrupts:\n");
-        for (const auto& i : jit_env.interrupts)
-            std::puts(i.c_str());
-        fmt::print("===\n");
-        fmt::print("{}", jit.Disassemble());
+        fmt::print(
+            "\n"
+            "===\n"
+            "{}"
+            , jit.Disassemble()
+        );
     }
 }
 

src/dynarmic/tests/test_reader.cpp

@@ -99,7 +99,6 @@ void RunTestInstance(Dynarmic::A32::Jit& jit,
         std::copy(instructions.begin(), instructions.end(), jit_env.code_mem.begin() + num_words);
         jit_env.PadCodeMem();
         jit_env.modified_memory.clear();
-        jit_env.interrupts.clear();
 
         jit.Regs() = regs;
         jit.ExtRegs() = vecs;
@@ -192,7 +191,6 @@ void RunTestInstance(A64::Jit& jit,
         jit_env.code_mem.emplace_back(0x14000000);  // B .
         jit_env.code_mem_start_address = start_address;
         jit_env.modified_memory.clear();
-        jit_env.interrupts.clear();
 
         jit.SetRegisters(regs);
         jit.SetVectors(vecs);