VERY experimental Nintendo Switch 2 emulator
C++
[dynarmic] restore proper backtraces for A64 (#3794)
lizzie59254cd1e7ef
diff --git a/src/core/arm/nce/interpreter_visitor.cpp b/src/core/arm/nce/interpreter_visitor.cppindex be6fee8613..077a696cc8 100644--- a/src/core/arm/nce/interpreter_visitor.cpp+++ b/src/core/arm/nce/interpreter_visitor.cpp@@ -773,7 +773,11 @@ std::optional<u64> MatchAndExecuteOneInstruction(Core::Memory::Memory& memory, mbool 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;}diff --git a/src/dynarmic/src/dynarmic/frontend/A64/decoder/a64.h b/src/dynarmic/src/dynarmic/frontend/A64/decoder/a64.hindex 4ac04731ea..eba9d73942 100644--- a/src/dynarmic/src/dynarmic/frontend/A64/decoder/a64.h+++ b/src/dynarmic/src/dynarmic/frontend/A64/decoder/a64.h@@ -70,14 +70,15 @@ constexpr DecodeTable<V> GetDecodeTable() {/// In practice it must always suceed, otherwise something else unrelated would have gone awrytemplate<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>diff --git a/src/dynarmic/src/dynarmic/frontend/A64/translate/a64_translate.cpp b/src/dynarmic/src/dynarmic/frontend/A64/translate/a64_translate.cppindex 6778d13890..4afce6bd29 100644--- a/src/dynarmic/src/dynarmic/frontend/A64/translate/a64_translate.cpp+++ b/src/dynarmic/src/dynarmic/frontend/A64/translate/a64_translate.cpp@@ -25,7 +25,11 @@ void Translate(IR::Block& block, LocationDescriptor descriptor, MemoryReadCodeFuconst 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;}