ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Stack traces: Add support for BLX instruction

This commit is contained in:
Adam Higerd 2020-08-10 12:02:32 -05:00 committed by Vicki Pfau
parent 1e16d9a4f7
commit 41a637c294
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mgba/internal/arm/decoder-inlines.h
View File

@ -27,7 +27,7 @@ static inline bool ARMInstructionIsBranch(enum ARMMnemonic mnemonic) {
case ARM_MN_B:
case ARM_MN_BL:
case ARM_MN_BX:
// TODO: case: ARM_MN_BLX:
case ARM_MN_BLX:
return true;
default:
return false;

2
src/arm/debugger/debugger.c
View File

@ -61,7 +61,7 @@ static bool ARMDebuggerUpdateStackTraceInternal(struct mDebuggerPlatform* d, uin
bool interrupt = false;
bool isWideInstruction = ARMDecodeCombined(cpu, &info);
if (!isWideInstruction && info.mnemonic == ARM_MN_BL) {
if (!isWideInstruction && (info.mnemonic == ARM_MN_BL || info.mnemonic == ARM_MN_BLX)) {
return false;
}
if (!ARMTestCondition(cpu, info.condition)) {