[Bug tdep/31278] [gdb/tdep, thumb2] GDB on arm-linux-gnueabihf fails gdb.reverse/func-map-to-same-line.exp

["vries at gcc dot gnu.org" <sourceware-bugzilla@sourceware.org>]

https://sourceware.org/bugzilla/show_bug.cgi?id=31278

--- Comment #10 from Tom de Vries <vries at gcc dot gnu.org> ---
(In reply to Luis Machado from comment #9)
> I'm guessing this is probably LDR (immediate) T4 encoding Post Indexed, with
> a write-back that is not being accounted for in gdb.
> 

Thanks, it is indeed, this helped me find the encoding documentation.

> The write-back bit seems to be bit 8. Does it show up as 1 for your case?
> 

Yes.

> It was probably an oversight, as we can that being handled in
> thumb_stack_frame_destroyed_p:
> 
>   else if (insn == 0xf85d  /* ldr.w <Rt>, [sp], #4 */
>            && (insn2 & 0x0fff) == 0x0b04)
>     found_stack_adjust = 1;

OK, so how about this:
...
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 861d50a6a3b..081e934cf86 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -14184,6 +14184,14 @@ thumb2_record_ld_word (arm_insn_decode_record
*thumb2_insn_r)
   record_buf[1] = ARM_PS_REGNUM;
   thumb2_insn_r->reg_rec_count = 2;

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

-- 
You are receiving this mail because:
You are on the CC list for the bug.