Skip to content

Commit 7e4208a

Browse files
committed
[gdb/tdep] Fix reverse execution of LDR(immediate) T4
When running test-case gdb.reverse/func-map-to-same-line.exp on arm-linux with target board unix/-mthumb, we run into: ... (gdb) reverse-step func2 () at func-map-to-same-line.c:26 26 { (gdb) FAIL: gdb.reverse/func-map-to-same-line.exp: \ column_info_flag=column-info: step-test: reverse-step into func2 ... The FAIL is caused by incorrect recording of this insn: ... 4f6: f85d 7b04 ldr.w r7, [sp], #4 ... The insn updates the sp, but we don't record this: ... $ gdb -q -batch func-map-to-same-line \ -ex "b *func2+8" \ -ex run \ -ex record \ -ex "set debug record 2" \ -ex stepi Breakpoint 1 at 0x4f6: file func-map-to-same-line.c, line 27. Breakpoint 1, 0xaaaaa4f6 in func2 () at func-map-to-same-line.c:27 27 } /* END FUNC2 */ Process record: arm_process_record addr = 0xaaaaa4f6 Process record: add register num = 15 to record list. Process record: record_full_arch_list_add 0xabc6c460. Process record: add register num = 7 to record list. Process record: record_full_arch_list_add 0xabc3b868. Process record: add register num = 25 to record list. ... [ Note that sp is r13, and we see here only r15 (pc), r7, and r25 (ps). ] The problem is that the specific insn, an LDR(immediate) T4, is not handled in thumb2_record_ld_word. Fix this by detecting the insn in thumb2_record_ld_word, and recording the updated base register. Tested on arm-linux. Reported-By: Thiago Jung Bauermann <[email protected]> Approved-By: Luis Machado <[email protected]> PR tdep/31278 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31278
1 parent 0fd4557 commit 7e4208a

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

gdb/arm-tdep.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14184,6 +14184,14 @@ thumb2_record_ld_word (arm_insn_decode_record *thumb2_insn_r)
1418414184
record_buf[1] = ARM_PS_REGNUM;
1418514185
thumb2_insn_r->reg_rec_count = 2;
1418614186

14187+
if ((thumb2_insn_r->arm_insn & 0xfff00900) == 0xf8500900)
14188+
{
14189+
/* Detected LDR(immediate), T4, with write-back bit set. Record Rn
14190+
update. */
14191+
record_buf[2] = bits (thumb2_insn_r->arm_insn, 16, 19);
14192+
thumb2_insn_r->reg_rec_count++;
14193+
}
14194+
1418714195
REG_ALLOC (thumb2_insn_r->arm_regs, thumb2_insn_r->reg_rec_count,
1418814196
record_buf);
1418914197
return ARM_RECORD_SUCCESS;

0 commit comments

Comments
 (0)