Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-04-10 07:38:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[dynarmic] restore proper backtraces for A64 (#3794)
Some checks are pending
tx-src / sources (push) Waiting to run
Details
Check Strings / check-strings (push) Waiting to run
Details

Browse source 
trivial changes, fixes hard crashes

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

Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3794
Reviewed-by: Maufeat <sahyno1996@gmail.com>
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
lizzie 2026-03-29 13:57:49 +02:00 • committed by crueter
parent 9a3af3a6a3
commit 59254cd1e7
No known key found for this signature in database
GPG key ID: 425ACD2D4830EBC6
3 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/core/arm/nce/interpreter_visitor.cpp
View file

@ -773,7 +773,11 @@ std::optional<u64> MatchAndExecuteOneInstruction(Core::Memory::Memory& memory, m
bool was_executed = false;
auto decoder = Dynarmic::A64::Decode<VisitorBase>(instruction);
was_executed = decoder.get().call(visitor, instruction);
if (decoder) {
was_executed = decoder->get().call(visitor, instruction);
} else {
was_executed = false;
}
return was_executed ? std::optional<u64>(pc + 4) : std::nullopt;
}

7
src/dynarmic/src/dynarmic/frontend/A64/decoder/a64.h
View file

@ -70,14 +70,15 @@ constexpr DecodeTable<V> GetDecodeTable() {
/// In practice it must always suceed, otherwise something else unrelated would have gone awry
template<typename V>
std::reference_wrapper<const Matcher<V>> Decode(u32 instruction) {
std::optional<std::reference_wrapper<const Matcher<V>>> Decode(u32 instruction) {
alignas(64) static const auto table = GetDecodeTable<V>();
const auto& subtable = table[detail::ToFastLookupIndex(instruction)];
auto iter = std::find_if(subtable.begin(), subtable.end(), [instruction](const auto& matcher) {
return matcher.Matches(instruction);
});
DEBUG_ASSERT(iter != subtable.end());
return std::reference_wrapper<const Matcher<V>>(*iter);
return iter != subtable.end()
? std::optional{ std::reference_wrapper<const Matcher<V>>(*iter) }
: std::nullopt;
}
template<typename V>

14
src/dynarmic/src/dynarmic/frontend/A64/translate/a64_translate.cpp
View file

@ -25,7 +25,11 @@ void Translate(IR::Block& block, LocationDescriptor descriptor, MemoryReadCodeFu
const u64 pc = visitor.ir.current_location->PC();
if (const auto instruction = memory_read_code(pc)) {
auto decoder = Decode<TranslatorVisitor>(*instruction);
should_continue = decoder.get().call(visitor, *instruction);
if (decoder) {
should_continue = decoder->get().call(visitor, *instruction);
} else {
should_continue = visitor.RaiseException(Exception::UnallocatedEncoding);
}
} else {
should_continue = visitor.RaiseException(Exception::NoExecuteFault);
}
@ -45,13 +49,15 @@ bool TranslateSingleInstruction(IR::Block& block, LocationDescriptor descriptor,
bool should_continue = true;
auto const decoder = Decode<TranslatorVisitor>(instruction);
should_continue = decoder.get().call(visitor, instruction);
if (decoder) {
should_continue = decoder->get().call(visitor, instruction);
} else {
should_continue = false;
}
visitor.ir.current_location = visitor.ir.current_location->AdvancePC(4);
block.CycleCount()++;
block.SetEndLocation(*visitor.ir.current_location);
return should_continue;
}