From 193774b320954b04d92a71f3b9ce329c349dd505 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Fri, 20 Jul 2007 17:29:59 +0000 Subject: [PATCH] * mips-tdep.c (heuristic_proc_start): Add more MIPS16 function prologue instructions. --- gdb/ChangeLog | 5 +++++ gdb/mips-tdep.c | 21 +++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index aaac11dbf8..60f4e9af76 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2004-07-20 Chris Dearman + + * mips-tdep.c (heuristic_proc_start): Add more MIPS16 function + prologue instructions. + 2007-07-20 Maciej W. Rozycki * mips-tdep.c (mips_next_pc): Use is_mips16_addr() instead of diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index b4153fd0fd..531d93610b 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -2396,15 +2396,28 @@ heuristic-fence-post' command.\n", paddr_nz (pc), paddr_nz (pc)); /* On MIPS16, any one of the following is likely to be the start of a function: + extend save + save entry addiu sp,-n daddiu sp,-n extend -n followed by 'addiu sp,+n' or 'daddiu sp,+n' */ inst = mips_fetch_instruction (start_pc); - if (((inst & 0xf81f) == 0xe809 && (inst & 0x700) != 0x700) /* entry */ - || (inst & 0xff80) == 0x6380 /* addiu sp,-n */ - || (inst & 0xff80) == 0xfb80 /* daddiu sp,-n */ - || ((inst & 0xf810) == 0xf010 && seen_adjsp)) /* extend -n */ + if ((inst & 0xff80) == 0x6480) /* save */ + { + if (start_pc - instlen >= fence) + { + inst = mips_fetch_instruction (start_pc - instlen); + if ((inst & 0xf800) == 0xf000) /* extend */ + start_pc -= instlen; + } + break; + } + else if (((inst & 0xf81f) == 0xe809 + && (inst & 0x700) != 0x700) /* entry */ + || (inst & 0xff80) == 0x6380 /* addiu sp,-n */ + || (inst & 0xff80) == 0xfb80 /* daddiu sp,-n */ + || ((inst & 0xf810) == 0xf010 && seen_adjsp)) /* extend -n */ break; else if ((inst & 0xff00) == 0x6300 /* addiu sp */ || (inst & 0xff00) == 0xfb00) /* daddiu sp */ -- 2.34.1