VERY experimental Nintendo Switch 2 emulator
C++
arm_interface: curb infinite recursion in stacktrace generation
Liam8544af06f54f
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cppindex d1e70f19d6..287ba102e6 100644--- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp+++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp@@ -450,7 +450,7 @@ std::vector<ARM_Interface::BacktraceEntry> ARM_Dynarmic_32::GetBacktrace(Core::S// Frame records are two words long:// fp+0 : pointer to previous frame record// fp+4 : value of lr for frame- while (true) {+ for (size_t i = 0; i < 256; i++) {out.push_back({"", 0, lr, 0, ""});if (!fp || (fp % 4 != 0) || !memory.IsValidVirtualAddressRange(fp, 8)) {break;diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cppindex 22b5d56568..afb7fb3a00 100644--- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp+++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp@@ -517,7 +517,7 @@ std::vector<ARM_Interface::BacktraceEntry> ARM_Dynarmic_64::GetBacktrace(Core::S// Frame records are two words long:// fp+0 : pointer to previous frame record// fp+8 : value of lr for frame- while (true) {+ for (size_t i = 0; i < 256; i++) {out.push_back({"", 0, lr, 0, ""});if (!fp || (fp % 4 != 0) || !memory.IsValidVirtualAddressRange(fp, 16)) {break;