aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorlizzie <lizzie@eden-emu.dev>2026-09-09 11:14:03 +0200
committercrueter <crueter@eden-emu.dev>2026-09-09 11:14:03 +0200
commit2f787ddb8cc18b1ac50c3078b7d03dee6ab89d44 (patch)
tree914623daf04d881009802197cd77994fb6cf9f88 /src
parent23585820bc6fc781a06c19a677c5f3ba652fd646 (diff)
[dynarmic] Fix broken tests and SIGABRT with f16 inst gen (#4366)
F16 instructions aren't supported yet, thus disable them. Also compilation/build errors. Signed-off-by: lizzie <lizzie@eden-emu.dev> - [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions). - [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md) - [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability. ------------------- Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4366 Reviewed-by: CamilleLaVey <camillelavey99@gmail.com> Reviewed-by: Maufeat <sahyno1996@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/dynarmic/tests/A32/fuzz_arm.cpp2
-rw-r--r--src/dynarmic/tests/A64/fuzz_with_unicorn.cpp2
-rw-r--r--src/dynarmic/tests/print_info.cpp14
-rw-r--r--src/dynarmic/tests/test_generator.cpp64
-rw-r--r--src/dynarmic/tests/test_reader.cpp2
5 files changed, 44 insertions, 40 deletions
diff --git a/src/dynarmic/tests/A32/fuzz_arm.cpp b/src/dynarmic/tests/A32/fuzz_arm.cpp
index e8f3011799..abb9830372 100644
--- a/src/dynarmic/tests/A32/fuzz_arm.cpp
+++ b/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;
diff --git a/src/dynarmic/tests/A64/fuzz_with_unicorn.cpp b/src/dynarmic/tests/A64/fuzz_with_unicorn.cpp
index 90df625143..ea5b5302f8 100644
--- a/src/dynarmic/tests/A64/fuzz_with_unicorn.cpp
+++ b/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;
diff --git a/src/dynarmic/tests/print_info.cpp b/src/dynarmic/tests/print_info.cpp
index 8901ea167d..5b1c5cfe63 100644
--- a/src/dynarmic/tests/print_info.cpp
+++ b/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;
}
diff --git a/src/dynarmic/tests/test_generator.cpp b/src/dynarmic/tests/test_generator.cpp
index dacb8a6004..35163fffcf 100644
--- a/src/dynarmic/tests/test_generator.cpp
+++ b/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()
+ );
}
}
diff --git a/src/dynarmic/tests/test_reader.cpp b/src/dynarmic/tests/test_reader.cpp
index 1c2cba1c44..d44e698c27 100644
--- a/src/dynarmic/tests/test_reader.cpp
+++ b/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);