diff options
| -rw-r--r-- | gdb/ChangeLog | 18 | ||||
| -rw-r--r-- | gdb/builtin-regs.c | 9 | ||||
| -rw-r--r-- | gdb/builtin-regs.h | 2 | ||||
| -rw-r--r-- | gdb/eval.c | 3 | ||||
| -rw-r--r-- | gdb/expprint.c | 11 | ||||
| -rw-r--r-- | gdb/frame.c | 43 | ||||
| -rw-r--r-- | gdb/frame.h | 7 | ||||
| -rw-r--r-- | gdb/infcmd.c | 2 | ||||
| -rw-r--r-- | gdb/parse.c | 39 | ||||
| -rw-r--r-- | gdb/parser-defs.h | 6 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/pc-fp.c | 14 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/pc-fp.exp | 94 |
13 files changed, 202 insertions, 50 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4d02daace3b..d710d900519 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,21 @@ +2002-09-25 Andrew Cagney <cagney@redhat.com> + + * frame.c: Include "gdb_string.h" and "builtin-regs.h". + (frame_map_regnum_to_name): New function. + (frame_map_name_to_regnum): New function. + * frame.h (frame_map_name_to_regnum): Declare. + (frame_map_regnum_to_name): Declare. + * builtin-regs.c (builtin_reg_map_regnum_to_name): New function. + * builtin-regs.h (builtin_reg_map_regnum_to_name): Declare. + * parse.c: Do not include "builtin-regs.h". + (target_map_name_to_register): Delete function. + (write_dollar_variable): Use frame_map_name_to_regnum. + * parser-defs.h (target_map_name_to_register): Delete declaration. + * expprint.c: Include "frame.h". + (print_subexp): Use frame_map_regnum_to_name. + * eval.c (evaluate_subexp_standard): Use frame_map_regnum_to_name. + * infcmd.c (registers_info): Use frame_map_name_to_regnum. + 2002-09-25 Andrew Cagney <ac131313@redhat.com> * rs6000-tdep.c (rs6000_frame_saved_pc): If the link register diff --git a/gdb/builtin-regs.c b/gdb/builtin-regs.c index 8c488e3a557..07e5fcca58a 100644 --- a/gdb/builtin-regs.c +++ b/gdb/builtin-regs.c @@ -68,6 +68,15 @@ builtin_reg_map_name_to_regnum (const char *name, int len) return -1; } +const char * +builtin_reg_map_regnum_to_name (int regnum) +{ + int reg = regnum - (NUM_REGS + NUM_PSEUDO_REGS); + if (reg < 0 || reg >= nr_builtin_regs) + return NULL; + return builtin_regs[reg].name; +} + struct value * value_of_builtin_reg (int regnum, struct frame_info *frame) { diff --git a/gdb/builtin-regs.h b/gdb/builtin-regs.h index b35c4e91362..fb9fbcf8f8e 100644 --- a/gdb/builtin-regs.h +++ b/gdb/builtin-regs.h @@ -26,6 +26,8 @@ extern int builtin_reg_map_name_to_regnum (const char *str, int len); +extern const char *builtin_reg_map_regnum_to_name (int regnum); + extern struct value *value_of_builtin_reg (int regnum, struct frame_info *frame); diff --git a/gdb/eval.c b/gdb/eval.c index 33ec9438a04..cbcf862e53a 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -448,7 +448,8 @@ evaluate_subexp_standard (struct type *expect_type, struct value *val = value_of_register (regno, selected_frame); (*pos) += 2; if (val == NULL) - error ("Value of register %s not available.", REGISTER_NAME (regno)); + error ("Value of register %s not available.", + frame_map_regnum_to_name (regno)); else return val; } diff --git a/gdb/expprint.c b/gdb/expprint.c index 9f3f1715321..aa8b8762012 100644 --- a/gdb/expprint.c +++ b/gdb/expprint.c @@ -26,6 +26,7 @@ #include "value.h" #include "language.h" #include "parser-defs.h" +#include "frame.h" /* For frame_map_regnum_to_name. */ #ifdef HAVE_CTYPE_H #include <ctype.h> @@ -119,10 +120,12 @@ print_subexp (register struct expression *exp, register int *pos, return; case OP_REGISTER: - (*pos) += 2; - fprintf_filtered (stream, "$%s", - REGISTER_NAME (longest_to_int (exp->elts[pc + 1].longconst))); - return; + { + int regnum = longest_to_int (exp->elts[pc + 1].longconst); + (*pos) += 2; + fprintf_filtered (stream, "$%s", frame_map_regnum_to_name (regnum)); + return; + } case OP_BOOL: (*pos) += 2; diff --git a/gdb/frame.c b/gdb/frame.c index 82754ef1ce5..1ad3b09f3bd 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -27,6 +27,8 @@ #include "inferior.h" /* for inferior_ptid */ #include "regcache.h" #include "gdb_assert.h" +#include "gdb_string.h" +#include "builtin-regs.h" /* Return a frame uniq ID that can be used to, later re-find the frame. */ @@ -233,3 +235,44 @@ frame_register_read (struct frame_info *frame, int regnum, void *myaddr) return !optim; } + + +/* Map between a frame register number and its name. A frame register + space is a superset of the cooked register space --- it also + includes builtin registers. */ + +int +frame_map_name_to_regnum (const char *name, int len) +{ + int i; + + /* Search register name space. */ + for (i = 0; i < NUM_REGS + NUM_PSEUDO_REGS; i++) + if (REGISTER_NAME (i) && len == strlen (REGISTER_NAME (i)) + && strncmp (name, REGISTER_NAME (i), len) == 0) + { + return i; + } + + /* Try builtin registers. */ + i = builtin_reg_map_name_to_regnum (name, len); + if (i >= 0) + { + /* A builtin register doesn't fall into the architecture's + register range. */ + gdb_assert (i >= NUM_REGS + NUM_PSEUDO_REGS); + return i; + } + + return -1; +} + +const char * +frame_map_regnum_to_name (int regnum) +{ + if (regnum < 0) + return NULL; + if (regnum < NUM_REGS + NUM_PSEUDO_REGS) + return REGISTER_NAME (regnum); + return builtin_reg_map_regnum_to_name (regnum); +} diff --git a/gdb/frame.h b/gdb/frame.h index df2a0215f1d..79bb3d95a6f 100644 --- a/gdb/frame.h +++ b/gdb/frame.h @@ -366,4 +366,11 @@ extern void get_saved_register (char *raw_buffer, int *optimized, extern int frame_register_read (struct frame_info *frame, int regnum, void *buf); +/* Map between a frame register number and its name. A frame register + space is a superset of the cooked register space --- it also + includes builtin registers. */ + +extern int frame_map_name_to_regnum (const char *name, int strlen); +extern const char *frame_map_regnum_to_name (int regnum); + #endif /* !defined (FRAME_H) */ diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 95636ca4666..a1d030bbce5 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -1701,7 +1701,7 @@ registers_info (char *addr_exp, int fpregs) ++end; numregs = NUM_REGS + NUM_PSEUDO_REGS; - regnum = target_map_name_to_register (addr_exp, end - addr_exp); + regnum = frame_map_name_to_regnum (addr_exp, end - addr_exp); if (regnum >= 0) goto found; diff --git a/gdb/parse.c b/gdb/parse.c index c5de0af3334..29b8e3c3709 100644 --- a/gdb/parse.c +++ b/gdb/parse.c @@ -47,7 +47,6 @@ #include "inferior.h" /* for NUM_PSEUDO_REGS. NOTE: replace with "gdbarch.h" when appropriate. */ #include "doublest.h" -#include "builtin-regs.h" #include "gdb_assert.h" @@ -106,42 +105,6 @@ struct funcall static struct funcall *funcall_chain; -/* The generic method for targets to specify how their registers are - named. The mapping can be derived from two sources: REGISTER_NAME; - or builtin regs. */ - -int -target_map_name_to_register (char *str, int len) -{ - int i; - - /* Search register name space. */ - for (i = 0; i < NUM_REGS + NUM_PSEUDO_REGS; i++) - if (REGISTER_NAME (i) && len == strlen (REGISTER_NAME (i)) - && STREQN (str, REGISTER_NAME (i), len)) - { - return i; - } - - /* Try builtin registers. */ - i = builtin_reg_map_name_to_regnum (str, len); - if (i >= 0) - { - gdb_assert (i >= NUM_REGS + NUM_PSEUDO_REGS); - return i; - } - - /* Try builtin registers. */ - i = builtin_reg_map_name_to_regnum (str, len); - if (i >= 0) - { - gdb_assert (i >= NUM_REGS + NUM_PSEUDO_REGS); - return i; - } - - return -1; -} - /* Begin counting arguments for a function call, saving the data about any containing call. */ @@ -491,7 +454,7 @@ write_dollar_variable (struct stoken str) /* Handle tokens that refer to machine registers: $ followed by a register name. */ - i = target_map_name_to_register (str.ptr + 1, str.length - 1); + i = frame_map_name_to_regnum (str.ptr + 1, str.length - 1); if (i >= 0) goto handle_register; diff --git a/gdb/parser-defs.h b/gdb/parser-defs.h index 748208ae6d1..b522241a464 100644 --- a/gdb/parser-defs.h +++ b/gdb/parser-defs.h @@ -210,12 +210,6 @@ struct op_print int right_assoc; }; -/* The generic method for targets to specify how their registers are - named. The mapping can be derived from two sources: REGISTER_NAME; - and builtin regs. */ - -extern int target_map_name_to_register (char *, int); - /* Function used to avoid direct calls to fprintf in the code generated by the bison parser. */ diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 954b9468c27..ab6cceaed9c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2002-09-25 Andrew Cagney <cagney@redhat.com> + + * gdb.base/pc-fp.exp, gdb.base/pc-fp.c: New test. + 2002-09-24 Andrew Cagney <ac131313@redhat.com> * gdb.gdb/complaints.exp (test_initial_complaints): Rename diff --git a/gdb/testsuite/gdb.base/pc-fp.c b/gdb/testsuite/gdb.base/pc-fp.c new file mode 100644 index 00000000000..8c89a0f0b81 --- /dev/null +++ b/gdb/testsuite/gdb.base/pc-fp.c @@ -0,0 +1,14 @@ +#include <stdio.h> + +void +foo (int i) +{ + i++; + printf ("In foo %d\n", i); +} + +int +main () +{ + foo (1); +} diff --git a/gdb/testsuite/gdb.base/pc-fp.exp b/gdb/testsuite/gdb.base/pc-fp.exp new file mode 100644 index 00000000000..f94e3314388 --- /dev/null +++ b/gdb/testsuite/gdb.base/pc-fp.exp @@ -0,0 +1,94 @@ +# Copyright 2002 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# Please email any bugs, comments, and/or additions to this file to: +# bug-gdb@prep.ai.mit.edu + +# The doco makes reference to built-in registers -- $pc and $fp. If +# the ISA contains registers by that name then they should be +# displayed. If the ISA contains registers identified as being +# equivalent, but have different names, then GDB will provide these as +# aliases. If the ISA doesn't provide any equivalent registers, then +# GDB will provide registers that map onto the frame's PC and FP. + +if $tracelevel then { + strace $tracelevel +} + +# +# test running programs +# +set prms_id 0 +set bug_id 0 + +set testfile "pc-fp" +set srcfile ${testfile}.c +set binfile ${objdir}/${subdir}/${testfile} + +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } { + gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." +} + +if [get_compiler_info ${binfile}] { + return -1 +} + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +if ![runto_main] then { + perror "couldn't run to breakpoint" + continue +} + +proc get_valueofx { fmt exp default } { + global gdb_prompt + send_gdb "print${fmt} ${exp}\n" + gdb_expect { + -re "\\$\[0-9\]* = (0x\[0-9a-zA-Z\]+).*$gdb_prompt $" { + set val $expect_out(1,string) + pass "get value of ${exp} ($val)" + } + timeout { + set size ${default} + fail "get value of ${exp} (timeout)" + } + } + return ${val} +} + +# Get the value of PC and FP + +set valueof_pc [get_valueofx "/x" "\$pc" "0"] +set valueof_fp [get_valueofx "/x" "\$fp" "0"] + +# Check that the sequence $REGNAME -> REGNUM -> $REGNAME works. Use +# display since that encodes and then decodes the expression parameter +# (and hence uses the mechanisms we're trying to test). + +gdb_test "display/i \$pc" "1: x/i +\\\$pc +${valueof_pc}.*" +gdb_test "display/w \$fp" "2: x/xw +\\\$fp +${valueof_fp}.*" + +# FIXME: cagney/2002-09-04: Should also check that ``info registers +# $pc'' et.al.'' come back with the same value as the above displays +# and a print --- assuming that is that people agree to such behavour. +# Need to re-write default_print_registers_info() for it to work (and +# such a rewrite is on the reggroups branch). + +# gdb_test "info registers \$pc" "${valueof_pc}" +# gdb_test "info registers \$fp" "${valueof_fp}" |