diff options
| author | Peter Schauer <Peter.Schauer@mytum.de> | 1997-04-26 10:41:14 +0000 |
|---|---|---|
| committer | Peter Schauer <Peter.Schauer@mytum.de> | 1997-04-26 10:41:14 +0000 |
| commit | fc3622611eb6f21df172286f197c8eafafdf0b91 (patch) | |
| tree | 58490fe91fdd2ac2fb1a383f07211696e6a48d9c /gdb | |
| parent | 95b71071825df95482061f9e942be6615ad28303 (diff) | |
| download | gdb-fc3622611eb6f21df172286f197c8eafafdf0b91.zip gdb-fc3622611eb6f21df172286f197c8eafafdf0b91.tar.gz gdb-fc3622611eb6f21df172286f197c8eafafdf0b91.tar.bz2 | |
* alpha-tdep.c (heuristic_proc_desc): Increase search limit
for return address register, handle `ret' instruction.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/alpha-tdep.c | 21 |
2 files changed, 18 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5a27eed..c6ff4a0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,4 +1,7 @@ -Sat Apr 26 02:42:52 1997 Peter Schauer (pes@regent.e-technik.tu-muenchen.de) +Sat Apr 26 03:38:02 1997 Peter Schauer (pes@regent.e-technik.tu-muenchen.de) + + * alpha-tdep.c (heuristic_proc_desc): Increase search limit + for return address register, handle `ret' instruction. * corelow.c (get_core_registers): Initialize cf. diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c index b19d85f..69be204 100644 --- a/gdb/alpha-tdep.c +++ b/gdb/alpha-tdep.c @@ -1,5 +1,5 @@ /* Target-dependent code for the ALPHA architecture, for GDB, the GNU Debugger. - Copyright 1993, 1994, 1995, 1996 Free Software Foundation, Inc. + Copyright 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc. This file is part of GDB. @@ -519,14 +519,18 @@ heuristic_proc_desc(start_pc, limit_pc, next_frame) rearrange the register saves. So we recognize only a few registers (t7, t9, ra) within the procedure prologue as valid return address registers. + If we encounter a return instruction, we extract the + the return address register from it. FIXME: Rewriting GDB to access the procedure descriptors, e.g. via the minimal symbol table, might obviate this hack. */ if (pcreg == -1 - && cur_pc < (start_pc + 20) + && cur_pc < (start_pc + 80) && (reg == T7_REGNUM || reg == T9_REGNUM || reg == RA_REGNUM)) pcreg = reg; } + else if ((word & 0xffe0ffff) == 0x6be08001) /* ret zero,reg,1 */ + pcreg = (word >> 16) & 0x1f; else if (word == 0x47de040f) /* bis sp,sp fp */ has_frame_reg = 1; } @@ -534,15 +538,13 @@ heuristic_proc_desc(start_pc, limit_pc, next_frame) { /* If we haven't found a valid return address register yet, keep searching in the procedure prologue. */ - while (cur_pc < (limit_pc + 20) && cur_pc < (start_pc + 20)) + while (cur_pc < (limit_pc + 80) && cur_pc < (start_pc + 80)) { char buf[4]; unsigned long word; - int status; - status = read_memory_nobpt (cur_pc, buf, 4); - if (status) - memory_error (status, cur_pc); + if (read_memory_nobpt (cur_pc, buf, 4)) + break; cur_pc += 4; word = extract_unsigned_integer (buf, 4); @@ -556,6 +558,11 @@ heuristic_proc_desc(start_pc, limit_pc, next_frame) break; } } + else if ((word & 0xffe0ffff) == 0x6be08001) /* ret zero,reg,1 */ + { + pcreg = (word >> 16) & 0x1f; + break; + } } } |