From 82de1e5bfbe5e536e9b240fd4a9eefbe52bdeedb Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sat, 3 May 2003 00:26:34 +0000 Subject: 2003-05-02 Andrew Cagney * std-regs.c (value_of_builtin_frame_pc_reg): Delete #ifdef PC_REGNUM, re-indent. * stack.c (frame_info): Use "pc" for the name of get_frame_pc when PC_REGNUM isn't set. --- gdb/ChangeLog | 5 +++++ gdb/stack.c | 19 +++++++++++++++++-- gdb/std-regs.c | 23 +++++++++++------------ 3 files changed, 33 insertions(+), 14 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d861069..d32da66 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2003-05-02 Andrew Cagney + * std-regs.c (value_of_builtin_frame_pc_reg): Delete #ifdef + PC_REGNUM, re-indent. + * stack.c (frame_info): Use "pc" for the name of get_frame_pc when + PC_REGNUM isn't set. + * gdbarch.sh (REGISTER_SIZE, REGISTER_BYTES): Make optional. * gdbarch.h, gdbarch.c: Re-generate. * d10v-tdep.c (d10v_gdbarch_init): Do not set register_size, diff --git a/gdb/stack.c b/gdb/stack.c index 2cb9a95..cfb3605 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -614,10 +614,25 @@ frame_info (char *addr_exp, int from_tty) int i, count, numregs; char *funname = 0; enum language funlang = language_unknown; + const char *pc_regname; if (!target_has_stack) error ("No stack."); + /* Name of the value returned by get_frame_pc(). Per comments, "pc" + is not a good name. */ + if (PC_REGNUM >= 0) + /* OK, this is weird. The PC_REGNUM hardware register's value can + easily not match that of the internal value returned by + get_frame_pc(). */ + pc_regname = REGISTER_NAME (PC_REGNUM); + else + /* But then, this is weird to. Even without PC_REGNUM, an + architectures will often have a hardware register called "pc", + and that register's value, again, can easily not match + get_frame_pc(). */ + pc_regname = "pc"; + fi = parse_frame_specification (addr_exp); if (fi == NULL) error ("Invalid frame specified."); @@ -680,7 +695,7 @@ frame_info (char *addr_exp, int from_tty) print_address_numeric (get_frame_base (fi), 1, gdb_stdout); printf_filtered (":\n"); } - printf_filtered (" %s = ", REGISTER_NAME (PC_REGNUM)); + printf_filtered (" %s = ", pc_regname); print_address_numeric (get_frame_pc (fi), 1, gdb_stdout); wrap_here (" "); @@ -695,7 +710,7 @@ frame_info (char *addr_exp, int from_tty) printf_filtered (" (%s:%d)", sal.symtab->filename, sal.line); puts_filtered ("; "); wrap_here (" "); - printf_filtered ("saved %s ", REGISTER_NAME (PC_REGNUM)); + printf_filtered ("saved %s ", pc_regname); print_address_numeric (frame_pc_unwind (fi), 1, gdb_stdout); printf_filtered ("\n"); diff --git a/gdb/std-regs.c b/gdb/std-regs.c index 9f6f9ac..93d5102 100644 --- a/gdb/std-regs.c +++ b/gdb/std-regs.c @@ -98,20 +98,19 @@ value_of_builtin_frame_fp_reg (struct frame_info *frame) static struct value * value_of_builtin_frame_pc_reg (struct frame_info *frame) { -#ifdef PC_REGNUM if (PC_REGNUM >= 0) return value_of_register (PC_REGNUM, frame); -#endif - { - struct value *val = allocate_value (builtin_type_void_data_ptr); - char *buf = VALUE_CONTENTS_RAW (val); - if (frame == NULL) - memset (buf, TYPE_LENGTH (VALUE_TYPE (val)), 0); - else - ADDRESS_TO_POINTER (builtin_type_void_data_ptr, buf, - get_frame_pc (frame)); - return val; - } + else + { + struct value *val = allocate_value (builtin_type_void_data_ptr); + char *buf = VALUE_CONTENTS_RAW (val); + if (frame == NULL) + memset (buf, TYPE_LENGTH (VALUE_TYPE (val)), 0); + else + ADDRESS_TO_POINTER (builtin_type_void_data_ptr, buf, + get_frame_pc (frame)); + return val; + } } static struct value * -- cgit v1.1