diff options
| author | nobody <> | 2003-09-18 09:10:42 +0000 |
|---|---|---|
| committer | nobody <> | 2003-09-18 09:10:42 +0000 |
| commit | 057c4d1c9f68cd1fd734356c0d399feb3f5aec92 (patch) | |
| tree | 8cd76b5b2a2c0d0744f866fbc726680a399ba533 | |
| parent | fda0518d0ee90fab80e5e440d82a3f1e2c12012c (diff) | |
| download | binutils-gdb-057c4d1c9f68cd1fd734356c0d399feb3f5aec92.tar.gz | |
This commit was manufactured by cvs2svn to create branchkettenis_sparc-20030918-branchpoint
'kettenis_sparc-20030918-branch'.
Sprout from ezannoni_pie-20030916-branch 2003-09-18 00:04:40 UTC nobody 'This commit was manufactured by cvs2svn to create branch'
Cherrypick from master 2003-09-18 09:10:41 UTC Andreas Schwab <schwab@linux-m68k.org> ' * simple.c (bfd_simple_get_relocated_section_contents): Use':
ChangeLog
bfd/ChangeLog
bfd/simple.c
bfd/version.h
configure
configure.in
gdb/ChangeLog
gdb/Makefile.in
gdb/arch-utils.c
gdb/arch-utils.h
gdb/arm-linux-tdep.c
gdb/config/m68k/tm-cisco.h
gdb/config/m68k/tm-delta68.h
gdb/config/pa/nm-hppah.h
gdb/core-sol2.c
gdb/cris-tdep.c
gdb/d10v-tdep.c
gdb/frame.c
gdb/gdbarch.c
gdb/gdbarch.h
gdb/gdbarch.sh
gdb/hppa-tdep.c
gdb/hppab-nat.c
gdb/hppah-nat.c
gdb/hppam3-nat.c
gdb/hpux-thread.c
gdb/i386gnu-nat.c
gdb/ia64-aix-nat.c
gdb/ia64-linux-nat.c
gdb/irix5-nat.c
gdb/lynx-nat.c
gdb/m68knbsd-nat.c
gdb/mcore-tdep.c
gdb/mi/ChangeLog
gdb/mi/mi-main.c
gdb/mips-linux-tdep.c
gdb/mips-tdep.c
gdb/mipsv4-nat.c
gdb/mn10300-tdep.c
gdb/ns32k-tdep.c
gdb/ns32knbsd-nat.c
gdb/ppc-bdm.c
gdb/ppc-linux-tdep.c
gdb/ppc-sysv-tdep.c
gdb/ppcnbsd-tdep.c
gdb/procfs.c
gdb/regcache.c
gdb/remote-sds.c
gdb/remote-vx68.c
gdb/remote-vxmips.c
gdb/remote-vxsparc.c
gdb/remote.c
gdb/rs6000-tdep.c
gdb/s390-tdep.c
gdb/sh64-tdep.c
gdb/sparc-linux-nat.c
gdb/sparc-nat.c
gdb/sparc-tdep.c
gdb/sparc64-tdep.c
gdb/sparcnbsd-tdep.c
gdb/stabsread.c
gdb/sun3-nat.c
gdb/testsuite/ChangeLog
gdb/testsuite/gdb.cp/gdb1355.cc
gdb/testsuite/gdb.cp/gdb1355.exp
gdb/v850-tdep.c
gdb/v850ice.c
gdb/vax-tdep.c
gdb/version.in
gdb/xstormy16-tdep.c
68 files changed, 690 insertions, 526 deletions
diff --git a/ChangeLog b/ChangeLog index 6e239e13245..58acd87e42e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-09-17 Daniel Jacobowitz <drow@mvista.com> + + * configure.in (TOPLEVEL_CONFIGURE_ARGUMENTS, baseargs): Fix + quoting. + * configure: Regenerated. + 2003-09-12 Michael Chastain <mec@shout.net> Fix PR gdb/857. diff --git a/bfd/ChangeLog b/bfd/ChangeLog index a2f8f86e2c9..a7ead7e54df 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2003-09-18 Andreas Schwab <schwab@suse.de> + + * simple.c (bfd_simple_get_relocated_section_contents): Use + _bfd_generic_link_hash_table_create instead of + bfd_link_hash_table_create. + 2003-09-10 H.J. Lu <hongjiu.lu@intel.com> * elfxx-ia64.c (elfNN_ia64_special_sections): Mark all sections diff --git a/bfd/simple.c b/bfd/simple.c index c2a741c6f90..9044c28b38d 100644 --- a/bfd/simple.c +++ b/bfd/simple.c @@ -185,7 +185,7 @@ bfd_simple_get_relocated_section_contents (bfd *abfd, memset (&link_info, 0, sizeof (link_info)); link_info.input_bfds = abfd; - link_info.hash = bfd_link_hash_table_create (abfd); + link_info.hash = _bfd_generic_link_hash_table_create (abfd); link_info.callbacks = &callbacks; callbacks.warning = simple_dummy_warning; callbacks.undefined_symbol = simple_dummy_undefined_symbol; diff --git a/bfd/version.h b/bfd/version.h index 3e3b0fe3b9a..cd7a5151fad 100644 --- a/bfd/version.h +++ b/bfd/version.h @@ -1,3 +1,3 @@ -#define BFD_VERSION_DATE 20030916 +#define BFD_VERSION_DATE 20030918 #define BFD_VERSION @bfd_version@ #define BFD_VERSION_STRING @bfd_version_string@ diff --git a/configure b/configure index b204110f118..a06c8ce584c 100755 --- a/configure +++ b/configure @@ -795,19 +795,13 @@ progname=$0 if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi # Export original configure arguments for use by sub-configures. These -# will be expanded once by make, and once by the shell, so they need to -# have '$' quoted for make, and then each argument quoted for the shell. -# What's more, the 'echo' below might expand backslashes. -cat <<\EOF_SED > conftestsed -s,\\,\\\\,g; s,\$,$$,g +# will be expanded by make, so quote '$'. +tmp="$progname $@" +sed -e 's,\$,$$,g' <<EOF_SED > conftestsed.out +$tmp EOF_SED -tmp="'$progname'" -for ac_arg -do - tmp="$tmp '"`echo "$ac_arg" | sed -f conftestsed` -done -rm -f conftestsed -TOPLEVEL_CONFIGURE_ARGUMENTS="$tmp" +TOPLEVEL_CONFIGURE_ARGUMENTS=`cat conftestsed.out` +rm -f conftestsed.out moveifchange=${srcdir}/move-if-change @@ -2516,7 +2510,7 @@ serialization_dependencies=serdep.tmp # Base args. Strip norecursion, cache-file, srcdir, host, build, # target and nonopt. These are the ones we might not want to pass -# down to subconfigures. +# down to subconfigures. These will be expanded by make, so quote '$'. cat <<\EOF_SED > conftestsed s/ --no[^ ]* / / s/ --c[a-z-]*[= ][^ ]* / / @@ -2531,10 +2525,13 @@ s/ -build[= ][^ ]* / / s/ -target[= ][^ ]* / / s/ [^' -][^ ]* / / s/^ *//;s/ *$// -s,\\,\\\\,g; s,\$,$$,g +s,\$,$$,g +EOF_SED +sed -f conftestsed <<EOF_SED > conftestsed.out + ${ac_configure_args} EOF_SED -baseargs=`echo " ${ac_configure_args} " | sed -f conftestsed` -rm -f conftestsed +baseargs=`cat conftestsed.out` +rm -f conftestsed conftestsed.out # For the build-side libraries, we just need to pretend we're native, # and not use the same cache file. Multilibs are neither needed nor @@ -2785,7 +2782,7 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias- # Extract the first word of "${ncn_tool_prefix}ar", so it can be a program name with args. set dummy ${ncn_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2789: checking for $ac_word" >&5 +echo "configure:2786: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2818,7 +2815,7 @@ if test -z "$ac_cv_prog_AR" ; then # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2822: checking for $ac_word" >&5 +echo "configure:2819: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2857,7 +2854,7 @@ fi # Extract the first word of "${ncn_tool_prefix}as", so it can be a program name with args. set dummy ${ncn_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2861: checking for $ac_word" >&5 +echo "configure:2858: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2890,7 +2887,7 @@ if test -z "$ac_cv_prog_AS" ; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2894: checking for $ac_word" >&5 +echo "configure:2891: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2929,7 +2926,7 @@ fi # Extract the first word of "${ncn_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ncn_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2933: checking for $ac_word" >&5 +echo "configure:2930: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2962,7 +2959,7 @@ if test -z "$ac_cv_prog_DLLTOOL" ; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2966: checking for $ac_word" >&5 +echo "configure:2963: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3001,7 +2998,7 @@ fi # Extract the first word of "${ncn_tool_prefix}ld", so it can be a program name with args. set dummy ${ncn_tool_prefix}ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3005: checking for $ac_word" >&5 +echo "configure:3002: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3034,7 +3031,7 @@ if test -z "$ac_cv_prog_LD" ; then # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3038: checking for $ac_word" >&5 +echo "configure:3035: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3073,7 +3070,7 @@ fi # Extract the first word of "${ncn_tool_prefix}nm", so it can be a program name with args. set dummy ${ncn_tool_prefix}nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3077: checking for $ac_word" >&5 +echo "configure:3074: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3106,7 +3103,7 @@ if test -z "$ac_cv_prog_NM" ; then # Extract the first word of "nm", so it can be a program name with args. set dummy nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3110: checking for $ac_word" >&5 +echo "configure:3107: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3145,7 +3142,7 @@ fi # Extract the first word of "${ncn_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ncn_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3149: checking for $ac_word" >&5 +echo "configure:3146: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3178,7 +3175,7 @@ if test -z "$ac_cv_prog_RANLIB" ; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3182: checking for $ac_word" >&5 +echo "configure:3179: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3217,7 +3214,7 @@ fi # Extract the first word of "${ncn_tool_prefix}windres", so it can be a program name with args. set dummy ${ncn_tool_prefix}windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3221: checking for $ac_word" >&5 +echo "configure:3218: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3250,7 +3247,7 @@ if test -z "$ac_cv_prog_WINDRES" ; then # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3254: checking for $ac_word" >&5 +echo "configure:3251: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3289,7 +3286,7 @@ fi # Extract the first word of "${ncn_tool_prefix}objcopy", so it can be a program name with args. set dummy ${ncn_tool_prefix}objcopy; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3293: checking for $ac_word" >&5 +echo "configure:3290: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3322,7 +3319,7 @@ if test -z "$ac_cv_prog_OBJCOPY" ; then # Extract the first word of "objcopy", so it can be a program name with args. set dummy objcopy; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3326: checking for $ac_word" >&5 +echo "configure:3323: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJCOPY'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3361,7 +3358,7 @@ fi # Extract the first word of "${ncn_tool_prefix}objdump", so it can be a program name with args. set dummy ${ncn_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3365: checking for $ac_word" >&5 +echo "configure:3362: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3394,7 +3391,7 @@ if test -z "$ac_cv_prog_OBJDUMP" ; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3398: checking for $ac_word" >&5 +echo "configure:3395: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3442,7 +3439,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}ar", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3446: checking for $ac_word" >&5 +echo "configure:3443: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3475,7 +3472,7 @@ if test -z "$ac_cv_prog_AR_FOR_TARGET" ; then # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3479: checking for $ac_word" >&5 +echo "configure:3476: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3514,7 +3511,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}as", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3518: checking for $ac_word" >&5 +echo "configure:3515: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3547,7 +3544,7 @@ if test -z "$ac_cv_prog_AS_FOR_TARGET" ; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3551: checking for $ac_word" >&5 +echo "configure:3548: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3586,7 +3583,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3590: checking for $ac_word" >&5 +echo "configure:3587: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3619,7 +3616,7 @@ if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" ; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3623: checking for $ac_word" >&5 +echo "configure:3620: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3658,7 +3655,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}ld", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3662: checking for $ac_word" >&5 +echo "configure:3659: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3691,7 +3688,7 @@ if test -z "$ac_cv_prog_LD_FOR_TARGET" ; then # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3695: checking for $ac_word" >&5 +echo "configure:3692: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3730,7 +3727,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}nm", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3734: checking for $ac_word" >&5 +echo "configure:3731: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3763,7 +3760,7 @@ if test -z "$ac_cv_prog_NM_FOR_TARGET" ; then # Extract the first word of "nm", so it can be a program name with args. set dummy nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3767: checking for $ac_word" >&5 +echo "configure:3764: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3802,7 +3799,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3806: checking for $ac_word" >&5 +echo "configure:3803: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3835,7 +3832,7 @@ if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" ; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3839: checking for $ac_word" >&5 +echo "configure:3836: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3874,7 +3871,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}windres", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3878: checking for $ac_word" >&5 +echo "configure:3875: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3907,7 +3904,7 @@ if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" ; then # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3911: checking for $ac_word" >&5 +echo "configure:3908: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3974,7 +3971,7 @@ RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target} NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target} echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:3978: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:3975: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" diff --git a/configure.in b/configure.in index ae3ff2ae8c8..74ea0e13902 100644 --- a/configure.in +++ b/configure.in @@ -67,19 +67,13 @@ progname=$0 if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi # Export original configure arguments for use by sub-configures. These -# will be expanded once by make, and once by the shell, so they need to -# have '$' quoted for make, and then each argument quoted for the shell. -# What's more, the 'echo' below might expand backslashes. -cat <<\EOF_SED > conftestsed -s,\\,\\\\,g; s,\$,$$,g +# will be expanded by make, so quote '$'. +tmp="$progname $@" +sed -e 's,\$,$$,g' <<EOF_SED > conftestsed.out +$tmp EOF_SED -tmp="'$progname'" -for ac_arg -do - tmp="$tmp '"`echo "$ac_arg" | sed -f conftestsed` -done -rm -f conftestsed -TOPLEVEL_CONFIGURE_ARGUMENTS="$tmp" +TOPLEVEL_CONFIGURE_ARGUMENTS=`cat conftestsed.out` +rm -f conftestsed.out AC_SUBST(TOPLEVEL_CONFIGURE_ARGUMENTS) moveifchange=${srcdir}/move-if-change @@ -1766,7 +1760,7 @@ AC_SUBST_FILE(serialization_dependencies) # Base args. Strip norecursion, cache-file, srcdir, host, build, # target and nonopt. These are the ones we might not want to pass -# down to subconfigures. +# down to subconfigures. These will be expanded by make, so quote '$'. cat <<\EOF_SED > conftestsed s/ --no[[^ ]]* / / s/ --c[[a-z-]]*[[= ]][[^ ]]* / / @@ -1781,10 +1775,13 @@ s/ -build[[= ]][[^ ]]* / / s/ -target[[= ]][[^ ]]* / / s/ [[^' -][^ ]*] / / s/^ *//;s/ *$// -s,\\,\\\\,g; s,\$,$$,g +s,\$,$$,g +EOF_SED +sed -f conftestsed <<EOF_SED > conftestsed.out + ${ac_configure_args} EOF_SED -baseargs=`echo " ${ac_configure_args} " | sed -f conftestsed` -rm -f conftestsed +baseargs=`cat conftestsed.out` +rm -f conftestsed conftestsed.out # For the build-side libraries, we just need to pretend we're native, # and not use the same cache file. Multilibs are neither needed nor diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 76ed750fe9d..33db947068c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,65 @@ +2003-09-17 Jim Blandy <jimb@redhat.com> + + * Makefile.in (dis_asm_h): Note that this #includes "bfd.h". + +2003-09-17 Andrew Cagney <cagney@redhat.com> + + * ppcnbsd-tdep.c (ppcnbsd_use_struct_convention): New function. + (ppcnbsd_init_abi): Set "use_struct_convention" to + "ppcnbsd_use_struct_convention". + +2003-09-17 Mark Kettenis <kettenis@gnu.org> + + * gdbarch.sh (DEPRECATED_REG_STRUCT_HAS_ADDR): Add comment. + * gdbarch.h, gdbarch.c: Regenerate. + (stabs_argument_has_addr): New architecture method. + * arch-utils.h (default_stabs_argument_has_addr): New prototype. + * arch-utils.c: Include "buildsym.h". + (default_stabs_argument_has_addr): New function. + * stabsread.c (define_symbol): Use stabs_argument_has_addr + instead of DEPRECATED_REG_STRUCT_HAS_ADDR. + +2003-09-17 Andrew Cagney <cagney@redhat.com> + + * gdbarch.sh (DEPRECATED_NPC_REGNUM): Deprecate NPC_REGNUM. + * gdbarch.h, gdbarch.c: Regenerate. + * core-sol2.c, hppa-tdep.c, lynx-nat.c, procfs.c: Update. + * regcache.c, remote-vxsparc.c, sparc-linux-nat.c: Update. + * sparc-nat.c, sparc-tdep.c, sparc64-tdep.c: Update. + * sparcnbsd-tdep.c: Update. + +2003-09-17 Andrew Cagney <cagney@redhat.com> + + * gdbarch.sh (DEPRECATED_REGISTER_BYTE): Rename REGISTER_BYTE. + * gdbarch.h, gdbarch.c: Regenerate. + * arm-linux-tdep.c, core-sol2.c, cris-tdep.c: Update. + * d10v-tdep.c, frame.c: Update. + * hppa-tdep.c, hppab-nat.c, hppah-nat.c, hppam3-nat.c: Update. + * hpux-thread.c, i386gnu-nat.c, ia64-aix-nat.c: Update. + * ia64-linux-nat.c, irix5-nat.c, lynx-nat.c, m68knbsd-nat.c: Update. + * mcore-tdep.c, mips-linux-tdep.c, mips-tdep.c: Update. + * mipsv4-nat.c, mn10300-tdep.c, ns32k-tdep.c: Update. + * ns32knbsd-nat.c, ppc-bdm.c, regcache.c, remote-sds.c: Update. + * remote-vx68.c, remote-vxmips.c, remote-vxsparc.c: Update. + * remote.c, rs6000-tdep.c, s390-tdep.c, sh64-tdep.c: Update. + * sparc-nat.c, sparc-tdep.c, sun3-nat.c, v850-tdep.c: Update. + * v850ice.c, vax-tdep.c, xstormy16-tdep.c: Update. + * config/m68k/tm-cisco.h, config/m68k/tm-delta68.h: Update. + * config/pa/nm-hppah.h: Update. + +2003-09-16 Andrew Cagney <cagney@redhat.com> + + * ppc-linux-tdep.c (ppc_linux_init_abi): Set the 32 bit + "use_struct_convention" to "ppc_linux_use_struct_convention". + (ppc_linux_use_struct_convention): New function. + * rs6000-tdep.c (rs6000_use_struct_convention): New function. + (rs6000_gdbarch_init): For AIX, set "use_struct_convention" to + "rs6000_use_struct_convention". + * ppc-tdep.h (ppc_sysv_abi_broken_use_struct_convention): Delete + declaration. + * ppc-sysv-tdep.c (ppc_sysv_abi_broken_use_struct_convention): + Delete function. + 2003-09-16 Andrew Cagney <cagney@redhat.com> * buildsym.c: Remove more occurances of "register". diff --git a/gdb/Makefile.in b/gdb/Makefile.in index f3a55098554..7b681e37234 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -576,7 +576,7 @@ coff_sym_h = $(INCLUDE_DIR)/coff/sym.h coff_symconst_h = $(INCLUDE_DIR)/coff/symconst.h coff_ecoff_h = $(INCLUDE_DIR)/coff/ecoff.h coff_internal_h = $(INCLUDE_DIR)/coff/internal.h -dis_asm_h = $(INCLUDE_DIR)/dis-asm.h +dis_asm_h = $(INCLUDE_DIR)/dis-asm.h $(bfd_h) elf_reloc_macros_h = $(INCLUDE_DIR)/elf/reloc-macros.h elf_sh_h = $(INCLUDE_DIR)/elf/sh.h elf_arm_h = $(INCLUDE_DIR)/elf/arm.h $(elf_reloc_macros_h) diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index e344ec05470..9289e7adeaf 100644 --- a/gdb/arch-utils.c +++ b/gdb/arch-utils.c @@ -23,6 +23,7 @@ #include "defs.h" #include "arch-utils.h" +#include "buildsym.h" #include "gdbcmd.h" #include "inferior.h" /* enum CALL_DUMMY_LOCATION et.al. */ #include "gdb_string.h" @@ -359,6 +360,23 @@ legacy_value_to_register (struct frame_info *frame, int regnum, put_frame_register (frame, regnum, to); } +int +default_stabs_argument_has_addr (struct gdbarch *gdbarch, struct type *type) +{ + if (DEPRECATED_REG_STRUCT_HAS_ADDR_P () + && DEPRECATED_REG_STRUCT_HAS_ADDR (processing_gcc_compilation, type)) + { + CHECK_TYPEDEF (type); + + return (TYPE_CODE (type) == TYPE_CODE_STRUCT + || TYPE_CODE (type) == TYPE_CODE_UNION + || TYPE_CODE (type) == TYPE_CODE_SET + || TYPE_CODE (type) == TYPE_CODE_BITSTRING); + } + + return 0; +} + /* Functions to manipulate the endianness of the target. */ diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h index d2e682987b9..06f7bf30bda 100644 --- a/gdb/arch-utils.h +++ b/gdb/arch-utils.h @@ -138,6 +138,9 @@ extern void legacy_register_to_value (struct frame_info *frame, int regnum, extern void legacy_value_to_register (struct frame_info *frame, int regnum, struct type *type, const void *from); +extern int default_stabs_argument_has_addr (struct gdbarch *gdbarch, + struct type *type); + /* For compatibility with older architectures, returns (LEGACY_SIM_REGNO_IGNORE) when the register doesn't have a valid name. */ diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c index f3ec1f9d377..b5fb496deb4 100644 --- a/gdb/arm-linux-tdep.c +++ b/gdb/arm-linux-tdep.c @@ -86,7 +86,7 @@ arm_linux_extract_return_value (struct type *type, int regnum = ((TYPE_CODE_FLT == TYPE_CODE (type)) ? ARM_F0_REGNUM : ARM_A1_REGNUM); - memcpy (valbuf, ®buf[REGISTER_BYTE (regnum)], TYPE_LENGTH (type)); + memcpy (valbuf, ®buf[DEPRECATED_REGISTER_BYTE (regnum)], TYPE_LENGTH (type)); } /* Note: ScottB diff --git a/gdb/config/m68k/tm-cisco.h b/gdb/config/m68k/tm-cisco.h index 24db025bccf..51e2cdc39a2 100644 --- a/gdb/config/m68k/tm-cisco.h +++ b/gdb/config/m68k/tm-cisco.h @@ -51,5 +51,5 @@ /* BFD handles finding the registers in the core file, so they are at the start of the BFD .reg section. */ -#define REGISTER_U_ADDR(addr,blockend,regno) (addr = REGISTER_BYTE (regno)) +#define REGISTER_U_ADDR(addr,blockend,regno) (addr = DEPRECATED_REGISTER_BYTE (regno)) #define KERNEL_U_ADDR 0 diff --git a/gdb/config/m68k/tm-delta68.h b/gdb/config/m68k/tm-delta68.h index 25b747ec8eb..97112a83f46 100644 --- a/gdb/config/m68k/tm-delta68.h +++ b/gdb/config/m68k/tm-delta68.h @@ -50,7 +50,7 @@ struct frame_info; #define DEPRECATED_EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \ if (TYPE_CODE (TYPE) == TYPE_CODE_FLT) \ DEPRECATED_REGISTER_CONVERT_TO_VIRTUAL (FP0_REGNUM, TYPE, \ - ®BUF[REGISTER_BYTE (FP0_REGNUM)], \ + ®BUF[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], \ VALBUF); \ else \ memcpy ((VALBUF), \ @@ -70,7 +70,7 @@ struct frame_info; { \ char raw_buf[REGISTER_RAW_SIZE (FP0_REGNUM)]; \ DEPRECATED_REGISTER_CONVERT_TO_RAW (TYPE, FP0_REGNUM, VALBUF, raw_buf); \ - deprecated_write_register_bytes (REGISTER_BYTE (FP0_REGNUM), \ + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (FP0_REGNUM), \ raw_buf, REGISTER_RAW_SIZE (FP0_REGNUM)); \ } \ else \ diff --git a/gdb/config/pa/nm-hppah.h b/gdb/config/pa/nm-hppah.h index 25cb1ac1649..29a52dfcf72 100644 --- a/gdb/config/pa/nm-hppah.h +++ b/gdb/config/pa/nm-hppah.h @@ -25,7 +25,7 @@ /* What a coincidence! */ #define REGISTER_U_ADDR(addr, blockend, regno) \ -{ addr = (int)(blockend) + REGISTER_BYTE (regno);} +{ addr = (int)(blockend) + DEPRECATED_REGISTER_BYTE (regno);} /* This isn't really correct, because ptrace is actually a 32-bit interface. However, the modern HP-UX targets all really use diff --git a/gdb/core-sol2.c b/gdb/core-sol2.c index f978b68e784..a3652333a16 100644 --- a/gdb/core-sol2.c +++ b/gdb/core-sol2.c @@ -94,18 +94,18 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which, struct regs *gregs = (struct regs *) core_reg_sect; /* G0 *always* holds 0. */ - *(int *) &deprecated_registers[REGISTER_BYTE (0)] = 0; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (0)] = 0; /* The globals and output registers. */ - memcpy (&deprecated_registers[REGISTER_BYTE (G1_REGNUM)], + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (G1_REGNUM)], &gregs->r_g1, 15 * REGISTER_RAW_SIZE (G1_REGNUM)); - *(int *) &deprecated_registers[REGISTER_BYTE (PS_REGNUM)] + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)] = gregs->r_ps; - *(int *) &deprecated_registers[REGISTER_BYTE (PC_REGNUM)] + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)] = gregs->r_pc; - *(int *) &deprecated_registers[REGISTER_BYTE (NPC_REGNUM)] + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (DEPRECATED_NPC_REGNUM)] = gregs->r_npc; - *(int *) &deprecated_registers[REGISTER_BYTE (Y_REGNUM)] + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)] = gregs->r_y; /* My best guess at where to get the locals and input @@ -116,9 +116,9 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which, { int sp; - sp = *(int *) &deprecated_registers[REGISTER_BYTE (SP_REGNUM)]; + sp = *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (SP_REGNUM)]; if (0 != target_read_memory (sp, - &deprecated_registers[REGISTER_BYTE (L0_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (L0_REGNUM)], 16 * REGISTER_RAW_SIZE (L0_REGNUM))) { warning ("couldn't read input and local registers from core file\n"); @@ -167,9 +167,9 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which, { struct fpu *fpuregs = (struct fpu *) core_reg_sect; - memcpy (&deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], &fpuregs->fpu_fr, sizeof (fpuregs->fpu_fr)); - memcpy (&deprecated_registers[REGISTER_BYTE (FPS_REGNUM)], + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FPS_REGNUM)], &fpuregs->fpu_fsr, sizeof (FPU_FSR_TYPE)); } else diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c index 1ef0eee76d3..89f54cf2ea3 100644 --- a/gdb/cris-tdep.c +++ b/gdb/cris-tdep.c @@ -972,7 +972,7 @@ cris_abi_original_store_return_value (struct type *type, char *valbuf) int len = TYPE_LENGTH (type); if (len <= DEPRECATED_REGISTER_SIZE) - deprecated_write_register_bytes (REGISTER_BYTE (RET_REGNUM), valbuf, len); + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (RET_REGNUM), valbuf, len); else internal_error (__FILE__, __LINE__, "cris_abi_original_store_return_value: type length too large."); } @@ -987,8 +987,8 @@ cris_abi_v2_store_return_value (struct type *type, char *valbuf) if (len <= 2 * DEPRECATED_REGISTER_SIZE) { /* Note that this works since R10 and R11 are consecutive registers. */ - deprecated_write_register_bytes (REGISTER_BYTE (RET_REGNUM), valbuf, - len); + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (RET_REGNUM), + valbuf, len); } else internal_error (__FILE__, __LINE__, "cris_abi_v2_store_return_value: type length too large."); @@ -1058,7 +1058,7 @@ cris_abi_original_extract_return_value (struct type *type, char *regbuf, int len = TYPE_LENGTH (type); if (len <= DEPRECATED_REGISTER_SIZE) - memcpy (valbuf, regbuf + REGISTER_BYTE (RET_REGNUM), len); + memcpy (valbuf, regbuf + DEPRECATED_REGISTER_BYTE (RET_REGNUM), len); else internal_error (__FILE__, __LINE__, "cris_abi_original_extract_return_value: type length too large"); } @@ -1072,7 +1072,7 @@ cris_abi_v2_extract_return_value (struct type *type, char *regbuf, int len = TYPE_LENGTH (type); if (len <= 2 * DEPRECATED_REGISTER_SIZE) - memcpy (valbuf, regbuf + REGISTER_BYTE (RET_REGNUM), len); + memcpy (valbuf, regbuf + DEPRECATED_REGISTER_BYTE (RET_REGNUM), len); else internal_error (__FILE__, __LINE__, "cris_abi_v2_extract_return_value: type length too large"); } diff --git a/gdb/d10v-tdep.c b/gdb/d10v-tdep.c index 574ff4ddb75..129f56355c3 100644 --- a/gdb/d10v-tdep.c +++ b/gdb/d10v-tdep.c @@ -277,9 +277,9 @@ d10v_ts3_imap_register (void *regcache, int reg_nr) return reg; } -/* MAP GDB's internal register numbering (determined by the layout fo - the REGISTER_BYTE array) onto the simulator's register - numbering. */ +/* MAP GDB's internal register numbering (determined by the layout + from the DEPRECATED_REGISTER_BYTE array) onto the simulator's + register numbering. */ static int d10v_ts2_register_sim_regno (int nr) diff --git a/gdb/frame.c b/gdb/frame.c index 964d67c4c97..4e88018247f 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -1089,9 +1089,9 @@ const struct frame_unwind *legacy_saved_regs_unwind = &legacy_saved_regs_unwinde calculated rather than fetched). We will use not_lval for values fetched from generic dummy frames. - Set *ADDRP to the address, either in memory or as a REGISTER_BYTE - offset into the registers array. If the value is stored in a dummy - frame, set *ADDRP to zero. + Set *ADDRP to the address, either in memory or as a + DEPRECATED_REGISTER_BYTE offset into the registers array. If the + value is stored in a dummy frame, set *ADDRP to zero. The argument RAW_BUFFER must point to aligned memory. */ @@ -1172,7 +1172,7 @@ deprecated_generic_get_saved_register (char *raw_buffer, int *optimized, if (lval) /* found it in a live register */ *lval = lval_register; if (addrp) - *addrp = REGISTER_BYTE (regnum); + *addrp = DEPRECATED_REGISTER_BYTE (regnum); if (raw_buffer) deprecated_read_register_gen (regnum, raw_buffer); } diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index fd0d1daf50b..274e67ce841 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -142,7 +142,7 @@ struct gdbarch int pc_regnum; int ps_regnum; int fp0_regnum; - int npc_regnum; + int deprecated_npc_regnum; gdbarch_stab_reg_to_regnum_ftype *stab_reg_to_regnum; gdbarch_ecoff_reg_to_regnum_ftype *ecoff_reg_to_regnum; gdbarch_dwarf_reg_to_regnum_ftype *dwarf_reg_to_regnum; @@ -238,6 +238,7 @@ struct gdbarch gdbarch_deprecated_stack_align_ftype *deprecated_stack_align; gdbarch_frame_align_ftype *frame_align; gdbarch_deprecated_reg_struct_has_addr_ftype *deprecated_reg_struct_has_addr; + gdbarch_stabs_argument_has_addr_ftype *stabs_argument_has_addr; int frame_red_zone_size; int parm_boundary; const struct floatformat * float_format; @@ -310,7 +311,7 @@ struct gdbarch startup_gdbarch = -1, /* pc_regnum */ -1, /* ps_regnum */ 0, /* fp0_regnum */ - 0, /* npc_regnum */ + 0, /* deprecated_npc_regnum */ 0, /* stab_reg_to_regnum */ 0, /* ecoff_reg_to_regnum */ 0, /* dwarf_reg_to_regnum */ @@ -406,6 +407,7 @@ struct gdbarch startup_gdbarch = 0, /* deprecated_stack_align */ 0, /* frame_align */ 0, /* deprecated_reg_struct_has_addr */ + default_stabs_argument_has_addr, /* stabs_argument_has_addr */ 0, /* frame_red_zone_size */ 0, /* parm_boundary */ 0, /* float_format */ @@ -501,7 +503,7 @@ gdbarch_alloc (const struct gdbarch_info *info, current_gdbarch->pc_regnum = -1; current_gdbarch->ps_regnum = -1; current_gdbarch->fp0_regnum = -1; - current_gdbarch->npc_regnum = -1; + current_gdbarch->deprecated_npc_regnum = -1; current_gdbarch->stab_reg_to_regnum = no_op_reg_to_regnum; current_gdbarch->ecoff_reg_to_regnum = no_op_reg_to_regnum; current_gdbarch->dwarf_reg_to_regnum = no_op_reg_to_regnum; @@ -540,6 +542,7 @@ gdbarch_alloc (const struct gdbarch_info *info, current_gdbarch->frameless_function_invocation = generic_frameless_function_invocation_not; current_gdbarch->deprecated_frame_args_address = get_frame_base; current_gdbarch->deprecated_frame_locals_address = get_frame_base; + current_gdbarch->stabs_argument_has_addr = default_stabs_argument_has_addr; current_gdbarch->convert_from_func_ptr_addr = core_addr_identity; current_gdbarch->addr_bits_remove = core_addr_identity; current_gdbarch->smash_text_address = core_addr_identity; @@ -632,7 +635,7 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of pc_regnum, invalid_p == 0 */ /* Skip verify of ps_regnum, invalid_p == 0 */ /* Skip verify of fp0_regnum, invalid_p == 0 */ - /* Skip verify of npc_regnum, invalid_p == 0 */ + /* Skip verify of deprecated_npc_regnum, invalid_p == 0 */ /* Skip verify of stab_reg_to_regnum, invalid_p == 0 */ /* Skip verify of ecoff_reg_to_regnum, invalid_p == 0 */ /* Skip verify of dwarf_reg_to_regnum, invalid_p == 0 */ @@ -730,6 +733,7 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of deprecated_stack_align, has predicate */ /* Skip verify of frame_align, has predicate */ /* Skip verify of deprecated_reg_struct_has_addr, has predicate */ + /* Skip verify of stabs_argument_has_addr, invalid_p == 0 */ if (gdbarch->float_format == 0) gdbarch->float_format = default_float_format (gdbarch); if (gdbarch->double_format == 0) @@ -798,6 +802,9 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: register_reggroup_p = 0x%08lx\n", (long) current_gdbarch->register_reggroup_p); fprintf_unfiltered (file, + "gdbarch_dump: stabs_argument_has_addr = 0x%08lx\n", + (long) current_gdbarch->stabs_argument_has_addr); + fprintf_unfiltered (file, "gdbarch_dump: gdbarch_pseudo_register_read_p() = %d\n", gdbarch_pseudo_register_read_p (current_gdbarch)); fprintf_unfiltered (file, @@ -1357,6 +1364,14 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE = %d\n", DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE); #endif +#ifdef DEPRECATED_NPC_REGNUM + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_NPC_REGNUM # %s\n", + XSTRING (DEPRECATED_NPC_REGNUM)); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_NPC_REGNUM = %d\n", + DEPRECATED_NPC_REGNUM); +#endif #ifdef DEPRECATED_PC_IN_CALL_DUMMY_P fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -1452,6 +1467,25 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) (long) current_gdbarch->deprecated_push_return_address /*DEPRECATED_PUSH_RETURN_ADDRESS ()*/); #endif +#ifdef DEPRECATED_REGISTER_BYTE_P + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "DEPRECATED_REGISTER_BYTE_P()", + XSTRING (DEPRECATED_REGISTER_BYTE_P ())); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_REGISTER_BYTE_P() = %d\n", + DEPRECATED_REGISTER_BYTE_P ()); +#endif +#ifdef DEPRECATED_REGISTER_BYTE + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "DEPRECATED_REGISTER_BYTE(reg_nr)", + XSTRING (DEPRECATED_REGISTER_BYTE (reg_nr))); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_REGISTER_BYTE = <0x%08lx>\n", + (long) current_gdbarch->deprecated_register_byte + /*DEPRECATED_REGISTER_BYTE ()*/); +#endif #ifdef DEPRECATED_REGISTER_BYTES fprintf_unfiltered (file, "gdbarch_dump: DEPRECATED_REGISTER_BYTES # %s\n", @@ -1891,14 +1925,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: NAME_OF_MALLOC = %s\n", NAME_OF_MALLOC); #endif -#ifdef NPC_REGNUM - fprintf_unfiltered (file, - "gdbarch_dump: NPC_REGNUM # %s\n", - XSTRING (NPC_REGNUM)); - fprintf_unfiltered (file, - "gdbarch_dump: NPC_REGNUM = %d\n", - NPC_REGNUM); -#endif #ifdef NUM_PSEUDO_REGS fprintf_unfiltered (file, "gdbarch_dump: NUM_PSEUDO_REGS # %s\n", @@ -1996,25 +2022,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: push_dummy_code = 0x%08lx\n", (long) current_gdbarch->push_dummy_code); -#ifdef REGISTER_BYTE_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "REGISTER_BYTE_P()", - XSTRING (REGISTER_BYTE_P ())); - fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_BYTE_P() = %d\n", - REGISTER_BYTE_P ()); -#endif -#ifdef REGISTER_BYTE - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "REGISTER_BYTE(reg_nr)", - XSTRING (REGISTER_BYTE (reg_nr))); - fprintf_unfiltered (file, - "gdbarch_dump: REGISTER_BYTE = <0x%08lx>\n", - (long) current_gdbarch->deprecated_register_byte - /*REGISTER_BYTE ()*/); -#endif #ifdef REGISTER_BYTES_OK_P fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -2971,20 +2978,20 @@ set_gdbarch_fp0_regnum (struct gdbarch *gdbarch, } int -gdbarch_npc_regnum (struct gdbarch *gdbarch) +gdbarch_deprecated_npc_regnum (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); - /* Skip verify of npc_regnum, invalid_p == 0 */ + /* Skip verify of deprecated_npc_regnum, invalid_p == 0 */ if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_npc_regnum called\n"); - return gdbarch->npc_regnum; + fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_npc_regnum called\n"); + return gdbarch->deprecated_npc_regnum; } void -set_gdbarch_npc_regnum (struct gdbarch *gdbarch, - int npc_regnum) +set_gdbarch_deprecated_npc_regnum (struct gdbarch *gdbarch, + int deprecated_npc_regnum) { - gdbarch->npc_regnum = npc_regnum; + gdbarch->deprecated_npc_regnum = deprecated_npc_regnum; } int @@ -4931,6 +4938,23 @@ set_gdbarch_deprecated_reg_struct_has_addr (struct gdbarch *gdbarch, } int +gdbarch_stabs_argument_has_addr (struct gdbarch *gdbarch, struct type *type) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->stabs_argument_has_addr != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_stabs_argument_has_addr called\n"); + return gdbarch->stabs_argument_has_addr (gdbarch, type); +} + +void +set_gdbarch_stabs_argument_has_addr (struct gdbarch *gdbarch, + gdbarch_stabs_argument_has_addr_ftype stabs_argument_has_addr) +{ + gdbarch->stabs_argument_has_addr = stabs_argument_has_addr; +} + +int gdbarch_frame_red_zone_size (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 33ac7cdad43..9991371240a 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -374,13 +374,16 @@ extern void set_gdbarch_fp0_regnum (struct gdbarch *gdbarch, int fp0_regnum); #define FP0_REGNUM (gdbarch_fp0_regnum (current_gdbarch)) #endif -extern int gdbarch_npc_regnum (struct gdbarch *gdbarch); -extern void set_gdbarch_npc_regnum (struct gdbarch *gdbarch, int npc_regnum); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (NPC_REGNUM) -#error "Non multi-arch definition of NPC_REGNUM" +/* Replace DEPRECATED_NPC_REGNUM with an implementation of WRITE_PC + that updates PC, NPC and even NNPC. */ + +extern int gdbarch_deprecated_npc_regnum (struct gdbarch *gdbarch); +extern void set_gdbarch_deprecated_npc_regnum (struct gdbarch *gdbarch, int deprecated_npc_regnum); +#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_NPC_REGNUM) +#error "Non multi-arch definition of DEPRECATED_NPC_REGNUM" #endif -#if !defined (NPC_REGNUM) -#define NPC_REGNUM (gdbarch_npc_regnum (current_gdbarch)) +#if !defined (DEPRECATED_NPC_REGNUM) +#define DEPRECATED_NPC_REGNUM (gdbarch_deprecated_npc_regnum (current_gdbarch)) #endif /* Convert stab register number (from `r' declaration) to a gdb REGNUM. */ @@ -508,29 +511,29 @@ extern void set_gdbarch_deprecated_register_bytes (struct gdbarch *gdbarch, int function works. This simplifies the migration process - old code, calling DEPRECATED_REGISTER_BYTE, doesn't need to be modified. */ -#if defined (REGISTER_BYTE) -/* Legacy for systems yet to multi-arch REGISTER_BYTE */ -#if !defined (REGISTER_BYTE_P) -#define REGISTER_BYTE_P() (1) +#if defined (DEPRECATED_REGISTER_BYTE) +/* Legacy for systems yet to multi-arch DEPRECATED_REGISTER_BYTE */ +#if !defined (DEPRECATED_REGISTER_BYTE_P) +#define DEPRECATED_REGISTER_BYTE_P() (1) #endif #endif extern int gdbarch_deprecated_register_byte_p (struct gdbarch *gdbarch); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (REGISTER_BYTE_P) -#error "Non multi-arch definition of REGISTER_BYTE" +#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_REGISTER_BYTE_P) +#error "Non multi-arch definition of DEPRECATED_REGISTER_BYTE" #endif -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (REGISTER_BYTE_P) -#define REGISTER_BYTE_P() (gdbarch_deprecated_register_byte_p (current_gdbarch)) +#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (DEPRECATED_REGISTER_BYTE_P) +#define DEPRECATED_REGISTER_BYTE_P() (gdbarch_deprecated_register_byte_p (current_gdbarch)) #endif typedef int (gdbarch_deprecated_register_byte_ftype) (int reg_nr); extern int gdbarch_deprecated_register_byte (struct gdbarch *gdbarch, int reg_nr); extern void set_gdbarch_deprecated_register_byte (struct gdbarch *gdbarch, gdbarch_deprecated_register_byte_ftype *deprecated_register_byte); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (REGISTER_BYTE) -#error "Non multi-arch definition of REGISTER_BYTE" +#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_REGISTER_BYTE) +#error "Non multi-arch definition of DEPRECATED_REGISTER_BYTE" #endif -#if !defined (REGISTER_BYTE) -#define REGISTER_BYTE(reg_nr) (gdbarch_deprecated_register_byte (current_gdbarch, reg_nr)) +#if !defined (DEPRECATED_REGISTER_BYTE) +#define DEPRECATED_REGISTER_BYTE(reg_nr) (gdbarch_deprecated_register_byte (current_gdbarch, reg_nr)) #endif /* If all registers have identical raw and virtual sizes and those @@ -1936,6 +1939,9 @@ typedef CORE_ADDR (gdbarch_frame_align_ftype) (struct gdbarch *gdbarch, CORE_ADD extern CORE_ADDR gdbarch_frame_align (struct gdbarch *gdbarch, CORE_ADDR address); extern void set_gdbarch_frame_align (struct gdbarch *gdbarch, gdbarch_frame_align_ftype *frame_align); +/* DEPRECATED_REG_STRUCT_HAS_ADDR has been replaced by + stabs_argument_has_addr. */ + #if defined (DEPRECATED_REG_STRUCT_HAS_ADDR) /* Legacy for systems yet to multi-arch DEPRECATED_REG_STRUCT_HAS_ADDR */ #if !defined (DEPRECATED_REG_STRUCT_HAS_ADDR_P) @@ -1961,6 +1967,10 @@ extern void set_gdbarch_deprecated_reg_struct_has_addr (struct gdbarch *gdbarch, #define DEPRECATED_REG_STRUCT_HAS_ADDR(gcc_p, type) (gdbarch_deprecated_reg_struct_has_addr (current_gdbarch, gcc_p, type)) #endif +typedef int (gdbarch_stabs_argument_has_addr_ftype) (struct gdbarch *gdbarch, struct type *type); +extern int gdbarch_stabs_argument_has_addr (struct gdbarch *gdbarch, struct type *type); +extern void set_gdbarch_stabs_argument_has_addr (struct gdbarch *gdbarch, gdbarch_stabs_argument_has_addr_ftype *stabs_argument_has_addr); + extern int gdbarch_frame_red_zone_size (struct gdbarch *gdbarch); extern void set_gdbarch_frame_red_zone_size (struct gdbarch *gdbarch, int frame_red_zone_size); #if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (FRAME_RED_ZONE_SIZE) diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index c135bbfa379..47ca465c09f 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -453,7 +453,9 @@ v:2:SP_REGNUM:int:sp_regnum::::-1:-1::0 v:2:PC_REGNUM:int:pc_regnum::::-1:-1::0 v:2:PS_REGNUM:int:ps_regnum::::-1:-1::0 v:2:FP0_REGNUM:int:fp0_regnum::::0:-1::0 -v:2:NPC_REGNUM:int:npc_regnum::::0:-1::0 +# Replace DEPRECATED_NPC_REGNUM with an implementation of WRITE_PC +# that updates PC, NPC and even NNPC. +v:2:DEPRECATED_NPC_REGNUM:int:deprecated_npc_regnum::::0:-1::0 # Convert stab register number (from \`r\' declaration) to a gdb REGNUM. f:2:STAB_REG_TO_REGNUM:int:stab_reg_to_regnum:int stab_regnr:stab_regnr:::no_op_reg_to_regnum::0 # Provide a default mapping from a ecoff register number to a gdb REGNUM. @@ -481,7 +483,7 @@ v::DEPRECATED_REGISTER_BYTES:int:deprecated_register_bytes # consequence, even when the predicate is false, the corresponding # function works. This simplifies the migration process - old code, # calling DEPRECATED_REGISTER_BYTE, doesn't need to be modified. -F::REGISTER_BYTE:int:deprecated_register_byte:int reg_nr:reg_nr::generic_register_byte:generic_register_byte +F::DEPRECATED_REGISTER_BYTE:int:deprecated_register_byte:int reg_nr:reg_nr::generic_register_byte:generic_register_byte # If all registers have identical raw and virtual sizes and those # sizes agree with the value computed from REGISTER_TYPE, # DEPRECATED_REGISTER_RAW_SIZE can be deleted. See: maint print @@ -646,7 +648,10 @@ F:2:FRAME_NUM_ARGS:int:frame_num_args:struct frame_info *frame:frame # alignment. F:2:DEPRECATED_STACK_ALIGN:CORE_ADDR:deprecated_stack_align:CORE_ADDR sp:sp M:::CORE_ADDR:frame_align:CORE_ADDR address:address +# DEPRECATED_REG_STRUCT_HAS_ADDR has been replaced by +# stabs_argument_has_addr. F:2:DEPRECATED_REG_STRUCT_HAS_ADDR:int:deprecated_reg_struct_has_addr:int gcc_p, struct type *type:gcc_p, type +m:::int:stabs_argument_has_addr:struct type *type:type:::default_stabs_argument_has_addr::0 v::FRAME_RED_ZONE_SIZE:int:frame_red_zone_size v:2:PARM_BOUNDARY:int:parm_boundary # diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c index 3037dab73f9..0670807493a 100644 --- a/gdb/hppa-tdep.c +++ b/gdb/hppa-tdep.c @@ -1633,7 +1633,7 @@ hppa_push_dummy_frame (void) for (regnum = FP0_REGNUM; regnum < NUM_REGS; regnum++) { - deprecated_read_register_bytes (REGISTER_BYTE (regnum), + deprecated_read_register_bytes (DEPRECATED_REGISTER_BYTE (regnum), (char *) &freg_buffer, 8); sp = push_bytes (sp, (char *) &freg_buffer, 8); } @@ -1714,7 +1714,7 @@ hppa_pop_frame (void) if (fsr[regnum]) { read_memory (fsr[regnum], (char *) &freg_buffer, 8); - deprecated_write_register_bytes (REGISTER_BYTE (regnum), + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (regnum), (char *) &freg_buffer, 8); } @@ -2630,7 +2630,7 @@ hppa_target_write_pc (CORE_ADDR v, ptid_t ptid) write_register_pid (31, v | 0x3, ptid); write_register_pid (PC_REGNUM, v, ptid); - write_register_pid (NPC_REGNUM, v + 4, ptid); + write_register_pid (DEPRECATED_NPC_REGNUM, v + 4, ptid); } /* return the alignment of a type in bytes. Structures have the maximum @@ -2679,7 +2679,8 @@ pa_do_registers_info (int regnum, int fpregs) /* Make a copy of gdb's save area (may cause actual reads from the target). */ for (i = 0; i < NUM_REGS; i++) - frame_register_read (deprecated_selected_frame, i, raw_regs + REGISTER_BYTE (i)); + frame_register_read (deprecated_selected_frame, i, + raw_regs + DEPRECATED_REGISTER_BYTE (i)); if (regnum == -1) pa_print_registers (raw_regs, regnum, fpregs); @@ -2723,7 +2724,8 @@ pa_do_strcat_registers_info (int regnum, int fpregs, struct ui_file *stream, /* Make a copy of gdb's save area (may cause actual reads from the target). */ for (i = 0; i < NUM_REGS; i++) - frame_register_read (deprecated_selected_frame, i, raw_regs + REGISTER_BYTE (i)); + frame_register_read (deprecated_selected_frame, i, + raw_regs + DEPRECATED_REGISTER_BYTE (i)); if (regnum == -1) pa_strcat_registers (raw_regs, regnum, fpregs, stream); @@ -2792,7 +2794,7 @@ pa_register_look_aside (char *raw_regs, int regnum, long *raw_val) if (!is_pa_2) { - raw_val[1] = *(long *) (raw_regs + REGISTER_BYTE (regnum)); + raw_val[1] = *(long *) (raw_regs + DEPRECATED_REGISTER_BYTE (regnum)); return; } @@ -4816,13 +4818,13 @@ hppa32_store_return_value (struct type *type, char *valbuf) If its a float value, then we also store it into the floating point registers. */ - deprecated_write_register_bytes (REGISTER_BYTE (28) + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (28) + (TYPE_LENGTH (type) > 4 ? (8 - TYPE_LENGTH (type)) : (4 - TYPE_LENGTH (type))), valbuf, TYPE_LENGTH (type)); if (TYPE_CODE (type) == TYPE_CODE_FLT) - deprecated_write_register_bytes (REGISTER_BYTE (FP4_REGNUM), + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (FP4_REGNUM), valbuf, TYPE_LENGTH (type)); } @@ -4833,22 +4835,22 @@ hppa64_store_return_value (struct type *type, char *valbuf) { if (TYPE_CODE (type) == TYPE_CODE_FLT) deprecated_write_register_bytes - (REGISTER_BYTE (FP4_REGNUM) + (DEPRECATED_REGISTER_BYTE (FP4_REGNUM) + DEPRECATED_REGISTER_SIZE - TYPE_LENGTH (type), valbuf, TYPE_LENGTH (type)); else if (is_integral_type(type)) deprecated_write_register_bytes - (REGISTER_BYTE (28) + (DEPRECATED_REGISTER_BYTE (28) + DEPRECATED_REGISTER_SIZE - TYPE_LENGTH (type), valbuf, TYPE_LENGTH (type)); else if (TYPE_LENGTH (type) <= 8) deprecated_write_register_bytes - (REGISTER_BYTE (28),valbuf, TYPE_LENGTH (type)); + (DEPRECATED_REGISTER_BYTE (28),valbuf, TYPE_LENGTH (type)); else if (TYPE_LENGTH (type) <= 16) { - deprecated_write_register_bytes (REGISTER_BYTE (28),valbuf, 8); + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (28),valbuf, 8); deprecated_write_register_bytes - (REGISTER_BYTE (29), valbuf + 8, TYPE_LENGTH (type) - 8); + (DEPRECATED_REGISTER_BYTE (29), valbuf + 8, TYPE_LENGTH (type) - 8); } } @@ -4863,11 +4865,11 @@ void hppa32_extract_return_value (struct type *type, char *regbuf, char *valbuf) { if (TYPE_CODE (type) == TYPE_CODE_FLT) - memcpy (valbuf, regbuf + REGISTER_BYTE (FP4_REGNUM), TYPE_LENGTH (type)); + memcpy (valbuf, regbuf + DEPRECATED_REGISTER_BYTE (FP4_REGNUM), TYPE_LENGTH (type)); else memcpy (valbuf, (regbuf - + REGISTER_BYTE (28) + + DEPRECATED_REGISTER_BYTE (28) + (TYPE_LENGTH (type) > 4 ? (8 - TYPE_LENGTH (type)) : (4 - TYPE_LENGTH (type)))), @@ -4885,20 +4887,22 @@ hppa64_extract_return_value (struct type *type, char *regbuf, char *valbuf) Aggregates upto 128 bits are in r28 and r29, right padded. */ if (TYPE_CODE (type) == TYPE_CODE_FLT) memcpy (valbuf, - regbuf + REGISTER_BYTE (FP4_REGNUM) + regbuf + DEPRECATED_REGISTER_BYTE (FP4_REGNUM) + DEPRECATED_REGISTER_SIZE - TYPE_LENGTH (type), TYPE_LENGTH (type)); else if (is_integral_type(type)) memcpy (valbuf, - regbuf + REGISTER_BYTE (28) + regbuf + DEPRECATED_REGISTER_BYTE (28) + DEPRECATED_REGISTER_SIZE - TYPE_LENGTH (type), TYPE_LENGTH (type)); else if (TYPE_LENGTH (type) <= 8) - memcpy (valbuf, regbuf + REGISTER_BYTE (28), TYPE_LENGTH (type)); + memcpy (valbuf, regbuf + DEPRECATED_REGISTER_BYTE (28), + TYPE_LENGTH (type)); else if (TYPE_LENGTH (type) <= 16) { - memcpy (valbuf, regbuf + REGISTER_BYTE (28), 8); - memcpy (valbuf + 8, regbuf + REGISTER_BYTE (29), TYPE_LENGTH (type) - 8); + memcpy (valbuf, regbuf + DEPRECATED_REGISTER_BYTE (28), 8); + memcpy (valbuf + 8, regbuf + DEPRECATED_REGISTER_BYTE (29), + TYPE_LENGTH (type) - 8); } } @@ -5036,7 +5040,7 @@ hppa_extract_struct_value_address (char *regbuf) the address size is equal to the size of an int* _on the host_... One possible implementation that crossed my mind is to use extract_address. */ - return (*(int *)(regbuf + REGISTER_BYTE (28))); + return (*(int *)(regbuf + DEPRECATED_REGISTER_BYTE (28))); } /* Return True if REGNUM is not a register available to the user @@ -5174,7 +5178,7 @@ hppa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_sp_regnum (gdbarch, 30); set_gdbarch_fp0_regnum (gdbarch, 64); set_gdbarch_pc_regnum (gdbarch, PCOQ_HEAD_REGNUM); - set_gdbarch_npc_regnum (gdbarch, PCOQ_TAIL_REGNUM); + set_gdbarch_deprecated_npc_regnum (gdbarch, PCOQ_TAIL_REGNUM); set_gdbarch_deprecated_register_raw_size (gdbarch, hppa_register_raw_size); set_gdbarch_deprecated_register_byte (gdbarch, hppa_register_byte); set_gdbarch_deprecated_register_virtual_size (gdbarch, hppa_register_raw_size); diff --git a/gdb/hppab-nat.c b/gdb/hppab-nat.c index c8b561d667a..cbb481e82a3 100644 --- a/gdb/hppab-nat.c +++ b/gdb/hppab-nat.c @@ -118,7 +118,7 @@ store_inferior_registers (int regno) errno = 0; if (regno == PCOQ_HEAD_REGNUM || regno == PCOQ_TAIL_REGNUM) { - scratch = *(int *) &deprecated_registers[REGISTER_BYTE (regno)] | 0x3; + scratch = *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)] | 0x3; ptrace (PT_WUREGS, PIDGET (inferior_ptid), (PTRACE_ARG3_TYPE) regaddr, scratch); if (errno != 0) @@ -135,7 +135,7 @@ store_inferior_registers (int regno) errno = 0; ptrace (PT_WUREGS, PIDGET (inferior_ptid), (PTRACE_ARG3_TYPE) regaddr, - *(int *) &deprecated_registers[REGISTER_BYTE (regno) + i]); + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno) + i]); if (errno != 0) { /* Warning, not error, in case we are attached; sometimes the diff --git a/gdb/hppah-nat.c b/gdb/hppah-nat.c index 35395e71ad7..53599499c25 100644 --- a/gdb/hppah-nat.c +++ b/gdb/hppah-nat.c @@ -98,7 +98,7 @@ store_inferior_registers (int regno) /* Floating-point registers come from the ss_fpblock area. */ else if (regno >= FP0_REGNUM) addr = (HPPAH_OFFSETOF (save_state_t, ss_fpblock) - + (REGISTER_BYTE (regno) - REGISTER_BYTE (FP0_REGNUM))); + + (DEPRECATED_REGISTER_BYTE (regno) - DEPRECATED_REGISTER_BYTE (FP0_REGNUM))); /* Wide registers come from the ss_wide area. I think it's more PC to test (ss_flags & SS_WIDEREGS) to select @@ -107,13 +107,13 @@ store_inferior_registers (int regno) every register reference. Bleah. */ else if (len == 8) addr = (HPPAH_OFFSETOF (save_state_t, ss_wide) - + REGISTER_BYTE (regno)); + + DEPRECATED_REGISTER_BYTE (regno)); /* Narrow registers come from the ss_narrow area. Note that ss_narrow starts with gr1, not gr0. */ else if (len == 4) addr = (HPPAH_OFFSETOF (save_state_t, ss_narrow) - + (REGISTER_BYTE (regno) - REGISTER_BYTE (1))); + + (DEPRECATED_REGISTER_BYTE (regno) - DEPRECATED_REGISTER_BYTE (1))); else internal_error (__FILE__, __LINE__, "hppah-nat.c (write_register): unexpected register size"); @@ -128,7 +128,7 @@ store_inferior_registers (int regno) { CORE_ADDR temp; - temp = *(CORE_ADDR *)&deprecated_registers[REGISTER_BYTE (regno)]; + temp = *(CORE_ADDR *)&deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)]; /* Set the priv level (stored in the low two bits of the PC. */ temp |= 0x3; @@ -153,7 +153,7 @@ store_inferior_registers (int regno) the high part of IPSW. What will it take for HP to catch a clue about building sensible interfaces? */ if (regno == IPSW_REGNUM && len == 8) - *(int *)&deprecated_registers[REGISTER_BYTE (regno)] = 0; + *(int *)&deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)] = 0; #endif for (i = 0; i < len; i += sizeof (int)) @@ -161,7 +161,7 @@ store_inferior_registers (int regno) errno = 0; call_ptrace (PT_WUREGS, PIDGET (inferior_ptid), (PTRACE_ARG3_TYPE) addr + i, - *(int *) &deprecated_registers[REGISTER_BYTE (regno) + i]); + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno) + i]); if (errno != 0) { /* Warning, not error, in case we are attached; sometimes @@ -216,7 +216,7 @@ fetch_register (int regno) /* Floating-point registers come from the ss_fpblock area. */ else if (regno >= FP0_REGNUM) addr = (HPPAH_OFFSETOF (save_state_t, ss_fpblock) - + (REGISTER_BYTE (regno) - REGISTER_BYTE (FP0_REGNUM))); + + (DEPRECATED_REGISTER_BYTE (regno) - DEPRECATED_REGISTER_BYTE (FP0_REGNUM))); /* Wide registers come from the ss_wide area. I think it's more PC to test (ss_flags & SS_WIDEREGS) to select @@ -225,13 +225,13 @@ fetch_register (int regno) every register reference. Bleah. */ else if (len == 8) addr = (HPPAH_OFFSETOF (save_state_t, ss_wide) - + REGISTER_BYTE (regno)); + + DEPRECATED_REGISTER_BYTE (regno)); /* Narrow registers come from the ss_narrow area. Note that ss_narrow starts with gr1, not gr0. */ else if (len == 4) addr = (HPPAH_OFFSETOF (save_state_t, ss_narrow) - + (REGISTER_BYTE (regno) - REGISTER_BYTE (1))); + + (DEPRECATED_REGISTER_BYTE (regno) - DEPRECATED_REGISTER_BYTE (1))); else internal_error (__FILE__, __LINE__, diff --git a/gdb/hppam3-nat.c b/gdb/hppam3-nat.c index 4ec1c5066b8..a89fae99c8a 100644 --- a/gdb/hppam3-nat.c +++ b/gdb/hppam3-nat.c @@ -115,15 +115,15 @@ store_inferior_registers (int regno) */ if (regno > 0 && regno < NUM_REGS) { - memcpy (&state[regno], &deprecated_registers[REGISTER_BYTE (regno)], + memcpy (&state[regno], &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)], REGISTER_RAW_SIZE (regno)); } else { for (index = 0; index < NUM_REGS; index++) - memcpy (&state[index], &deprecated_registers[REGISTER_BYTE (index)], + memcpy (&state[index], &deprecated_registers[DEPRECATED_REGISTER_BYTE (index)], REGISTER_RAW_SIZE (index)); -/* state[index] = deprecated_registers[REGISTER_BYTE (index)]; */ +/* state[index] = deprecated_registers[DEPRECATED_REGISTER_BYTE (index)]; */ } diff --git a/gdb/hpux-thread.c b/gdb/hpux-thread.c index ed55c341596..d66874bb5c9 100644 --- a/gdb/hpux-thread.c +++ b/gdb/hpux-thread.c @@ -357,19 +357,19 @@ hpux_thread_store_registers (int regno) else if (regno == SP_REGNUM) { write_memory ((CORE_ADDR) & tcb_ptr->static_ctx.sp, - &deprecated_registers[REGISTER_BYTE (regno)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)], REGISTER_RAW_SIZE (regno)); tcb_ptr->static_ctx.sp = (cma__t_hppa_regs *) - (extract_unsigned_integer (&deprecated_registers[REGISTER_BYTE (regno)], + (extract_unsigned_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)], REGISTER_RAW_SIZE (regno)) + 160); } else if (regno == PC_REGNUM) write_memory (sp - 20, - &deprecated_registers[REGISTER_BYTE (regno)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)], REGISTER_RAW_SIZE (regno)); else write_memory (sp + regmap[regno], - &deprecated_registers[REGISTER_BYTE (regno)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)], REGISTER_RAW_SIZE (regno)); } } diff --git a/gdb/i386gnu-nat.c b/gdb/i386gnu-nat.c index 19a0654d76c..3a6c7978162 100644 --- a/gdb/i386gnu-nat.c +++ b/gdb/i386gnu-nat.c @@ -256,7 +256,7 @@ gnu_store_registers (int regno) } #define fill(state, regno) \ - memcpy (REG_ADDR(state, regno), &deprecated_registers[REGISTER_BYTE (regno)], \ + memcpy (REG_ADDR(state, regno), &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)], \ REGISTER_RAW_SIZE (regno)) if (regno == -1) diff --git a/gdb/ia64-aix-nat.c b/gdb/ia64-aix-nat.c index d4808467591..ee3dc16811b 100644 --- a/gdb/ia64-aix-nat.c +++ b/gdb/ia64-aix-nat.c @@ -86,7 +86,7 @@ fill_gregset (prgregset_t *gregsetp, int regno) #define COPY_REG(_fld_,_regi_) \ if ((regno == -1) || regno == _regi_) \ - memcpy (&(gregsetp->_fld_), &deprecated_registers[REGISTER_BYTE (_regi_)], \ + memcpy (&(gregsetp->_fld_), &deprecated_registers[DEPRECATED_REGISTER_BYTE (_regi_)], \ REGISTER_RAW_SIZE (_regi_)) for (regi = IA64_GR0_REGNUM; regi <= IA64_GR31_REGNUM; regi++) @@ -109,10 +109,10 @@ fill_gregset (prgregset_t *gregsetp, int regno) if (regno == IA64_BSP_REGNUM || regno == -1) { memcpy (&(gregsetp->__bspstore), - &deprecated_registers[REGISTER_BYTE (IA64_BSP_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (IA64_BSP_REGNUM)], REGISTER_RAW_SIZE (IA64_BSP_REGNUM)); - memcpy (&deprecated_registers[REGISTER_BYTE (IA64_BSPSTORE_REGNUM)], - &deprecated_registers[REGISTER_BYTE (IA64_BSP_REGNUM)], + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (IA64_BSPSTORE_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (IA64_BSP_REGNUM)], REGISTER_RAW_SIZE (IA64_BSP_REGNUM)); } @@ -154,7 +154,7 @@ fill_fpregset (prfpregset_t *fpregsetp, int regno) { if ((regno == -1) || (regno == regi)) { - from = (char *) &deprecated_registers[REGISTER_BYTE (regi)]; + from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regi)]; to = (char *) &(fpregsetp->__fpr[regi - IA64_FR0_REGNUM]); memcpy (to, from, REGISTER_RAW_SIZE (regi)); } diff --git a/gdb/ia64-linux-nat.c b/gdb/ia64-linux-nat.c index 0d29ce40f81..ebaad7cacbb 100644 --- a/gdb/ia64-linux-nat.c +++ b/gdb/ia64-linux-nat.c @@ -402,7 +402,7 @@ fill_gregset (gregset_t *gregsetp, int regno) #define COPY_REG(_idx_,_regi_) \ if ((regno == -1) || regno == _regi_) \ - memcpy (regp + _idx_, &deprecated_registers[REGISTER_BYTE (_regi_)], \ + memcpy (regp + _idx_, &deprecated_registers[DEPRECATED_REGISTER_BYTE (_regi_)], \ REGISTER_RAW_SIZE (_regi_)) for (regi = IA64_GR0_REGNUM; regi <= IA64_GR31_REGNUM; regi++) @@ -467,7 +467,7 @@ fill_fpregset (fpregset_t *fpregsetp, int regno) { if ((regno == -1) || (regno == regi)) { - from = (char *) &deprecated_registers[REGISTER_BYTE (regi)]; + from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regi)]; to = (char *) &((*fpregsetp)[regi - IA64_FR0_REGNUM]); memcpy (to, from, REGISTER_RAW_SIZE (regi)); } diff --git a/gdb/irix5-nat.c b/gdb/irix5-nat.c index c6f3bda63f4..f7c20343f0c 100644 --- a/gdb/irix5-nat.c +++ b/gdb/irix5-nat.c @@ -83,27 +83,27 @@ fill_gregset (gregset_t *gregsetp, int regno) for (regi = 0; regi <= CTX_RA; regi++) if ((regno == -1) || (regno == regi)) *(regp + regi) = - extract_signed_integer (&deprecated_registers[REGISTER_BYTE (regi)], + extract_signed_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (regi)], REGISTER_RAW_SIZE (regi)); if ((regno == -1) || (regno == PC_REGNUM)) *(regp + CTX_EPC) = - extract_signed_integer (&deprecated_registers[REGISTER_BYTE (PC_REGNUM)], + extract_signed_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)], REGISTER_RAW_SIZE (PC_REGNUM)); if ((regno == -1) || (regno == CAUSE_REGNUM)) *(regp + CTX_CAUSE) = - extract_signed_integer (&deprecated_registers[REGISTER_BYTE (CAUSE_REGNUM)], + extract_signed_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (CAUSE_REGNUM)], REGISTER_RAW_SIZE (CAUSE_REGNUM)); if ((regno == -1) || (regno == HI_REGNUM)) *(regp + CTX_MDHI) = - extract_signed_integer (&deprecated_registers[REGISTER_BYTE (HI_REGNUM)], + extract_signed_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (HI_REGNUM)], REGISTER_RAW_SIZE (HI_REGNUM)); if ((regno == -1) || (regno == LO_REGNUM)) *(regp + CTX_MDLO) = - extract_signed_integer (&deprecated_registers[REGISTER_BYTE (LO_REGNUM)], + extract_signed_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (LO_REGNUM)], REGISTER_RAW_SIZE (LO_REGNUM)); } @@ -145,14 +145,14 @@ fill_fpregset (fpregset_t *fpregsetp, int regno) { if ((regno == -1) || (regno == regi)) { - from = (char *) &deprecated_registers[REGISTER_BYTE (regi)]; + from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regi)]; to = (char *) &(fpregsetp->fp_r.fp_regs[regi - FP0_REGNUM]); memcpy (to, from, REGISTER_RAW_SIZE (regi)); } } if ((regno == -1) || (regno == FCRCS_REGNUM)) - fpregsetp->fp_csr = *(unsigned *) &deprecated_registers[REGISTER_BYTE (FCRCS_REGNUM)]; + fpregsetp->fp_csr = *(unsigned *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (FCRCS_REGNUM)]; } diff --git a/gdb/lynx-nat.c b/gdb/lynx-nat.c index f425cb9c37a..bbd88b60906 100644 --- a/gdb/lynx-nat.c +++ b/gdb/lynx-nat.c @@ -297,7 +297,7 @@ fetch_inferior_registers (int regno) supply_register (G0_REGNUM, buf); supply_register (TBR_REGNUM, (char *) &ec.tbr); - memcpy (&deprecated_registers[REGISTER_BYTE (G1_REGNUM)], &ec.g1, + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (G1_REGNUM)], &ec.g1, 4 * REGISTER_RAW_SIZE (G1_REGNUM)); for (i = G1_REGNUM; i <= G1_REGNUM + 3; i++) deprecated_register_valid[i] = 1; @@ -305,10 +305,10 @@ fetch_inferior_registers (int regno) supply_register (PS_REGNUM, (char *) &ec.psr); supply_register (Y_REGNUM, (char *) &ec.y); supply_register (PC_REGNUM, (char *) &ec.pc); - supply_register (NPC_REGNUM, (char *) &ec.npc); + supply_register (DEPRECATED_NPC_REGNUM, (char *) &ec.npc); supply_register (WIM_REGNUM, (char *) &ec.wim); - memcpy (&deprecated_registers[REGISTER_BYTE (O0_REGNUM)], ec.o, + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (O0_REGNUM)], ec.o, 8 * REGISTER_RAW_SIZE (O0_REGNUM)); for (i = O0_REGNUM; i <= O0_REGNUM + 7; i++) deprecated_register_valid[i] = 1; @@ -322,13 +322,13 @@ fetch_inferior_registers (int regno) sp = read_register (SP_REGNUM); target_read_memory (sp + FRAME_SAVED_I0, - &deprecated_registers[REGISTER_BYTE (I0_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (I0_REGNUM)], 8 * REGISTER_RAW_SIZE (I0_REGNUM)); for (i = I0_REGNUM; i <= I7_REGNUM; i++) deprecated_register_valid[i] = 1; target_read_memory (sp + FRAME_SAVED_L0, - &deprecated_registers[REGISTER_BYTE (L0_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (L0_REGNUM)], 8 * REGISTER_RAW_SIZE (L0_REGNUM)); for (i = L0_REGNUM; i <= L0_REGNUM + 7; i++) deprecated_register_valid[i] = 1; @@ -346,7 +346,7 @@ fetch_inferior_registers (int regno) if (errno) perror_with_name ("ptrace(PTRACE_GETFPREGS)"); - memcpy (&deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], fc.f.fregs, + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], fc.f.fregs, 32 * REGISTER_RAW_SIZE (FP0_REGNUM)); for (i = FP0_REGNUM; i <= FP0_REGNUM + 31; i++) deprecated_register_valid[i] = 1; @@ -384,16 +384,16 @@ store_inferior_registers (int regno) int retval; ec.tbr = read_register (TBR_REGNUM); - memcpy (&ec.g1, &deprecated_registers[REGISTER_BYTE (G1_REGNUM)], + memcpy (&ec.g1, &deprecated_registers[DEPRECATED_REGISTER_BYTE (G1_REGNUM)], 4 * REGISTER_RAW_SIZE (G1_REGNUM)); ec.psr = read_register (PS_REGNUM); ec.y = read_register (Y_REGNUM); ec.pc = read_register (PC_REGNUM); - ec.npc = read_register (NPC_REGNUM); + ec.npc = read_register (DEPRECATED_NPC_REGNUM); ec.wim = read_register (WIM_REGNUM); - memcpy (ec.o, &deprecated_registers[REGISTER_BYTE (O0_REGNUM)], + memcpy (ec.o, &deprecated_registers[DEPRECATED_REGISTER_BYTE (O0_REGNUM)], 8 * REGISTER_RAW_SIZE (O0_REGNUM)); errno = 0; @@ -415,11 +415,11 @@ store_inferior_registers (int regno) if (!deprecated_register_valid[L0_REGNUM + 5]) internal_error (__FILE__, __LINE__, "failed internal consistency check"); target_write_memory (sp + FRAME_SAVED_I0, - &deprecated_registers[REGISTER_BYTE (I0_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (I0_REGNUM)], 8 * REGISTER_RAW_SIZE (I0_REGNUM)); target_write_memory (sp + FRAME_SAVED_L0, - &deprecated_registers[REGISTER_BYTE (L0_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (L0_REGNUM)], 8 * REGISTER_RAW_SIZE (L0_REGNUM)); } else if (regno >= L0_REGNUM && regno <= I7_REGNUM) @@ -427,13 +427,13 @@ store_inferior_registers (int regno) if (!deprecated_register_valid[regno]) internal_error (__FILE__, __LINE__, "failed internal consistency check"); if (regno >= L0_REGNUM && regno <= L0_REGNUM + 7) - regoffset = REGISTER_BYTE (regno) - REGISTER_BYTE (L0_REGNUM) + regoffset = DEPRECATED_REGISTER_BYTE (regno) - DEPRECATED_REGISTER_BYTE (L0_REGNUM) + FRAME_SAVED_L0; else - regoffset = REGISTER_BYTE (regno) - REGISTER_BYTE (I0_REGNUM) + regoffset = DEPRECATED_REGISTER_BYTE (regno) - DEPRECATED_REGISTER_BYTE (I0_REGNUM) + FRAME_SAVED_I0; target_write_memory (sp + regoffset, - &deprecated_registers[REGISTER_BYTE (regno)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)], REGISTER_RAW_SIZE (regno)); } } @@ -450,7 +450,7 @@ store_inferior_registers (int regno) if (errno) perror_with_name ("ptrace(PTRACE_GETFPREGS)"); - memcpy (fc.f.fregs, &deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + memcpy (fc.f.fregs, &deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], 32 * REGISTER_RAW_SIZE (FP0_REGNUM)); fc.fsr = read_register (FPS_REGNUM); @@ -574,7 +574,7 @@ store_inferior_registers (int regno) { unsigned int reg; - reg = *(unsigned int *) &deprecated_registers[REGISTER_BYTE (regno) + i]; + reg = *(unsigned int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno) + i]; errno = 0; ptrace (ptrace_fun, PIDGET (inferior_ptid), diff --git a/gdb/m68knbsd-nat.c b/gdb/m68knbsd-nat.c index 191327a0f7b..46172439a2f 100644 --- a/gdb/m68knbsd-nat.c +++ b/gdb/m68knbsd-nat.c @@ -36,12 +36,12 @@ fetch_inferior_registers (int regno) ptrace (PT_GETREGS, PIDGET (inferior_ptid), (PTRACE_ARG3_TYPE) & inferior_registers, 0); - memcpy (&deprecated_registers[REGISTER_BYTE (0)], &inferior_registers, + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (0)], &inferior_registers, sizeof (inferior_registers)); ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), (PTRACE_ARG3_TYPE) & inferior_fp_registers, 0); - memcpy (&deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], &inferior_fp_registers, + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], &inferior_fp_registers, sizeof (inferior_fp_registers)); deprecated_registers_fetched (); @@ -53,12 +53,12 @@ store_inferior_registers (int regno) struct reg inferior_registers; struct fpreg inferior_fp_registers; - memcpy (&inferior_registers, &deprecated_registers[REGISTER_BYTE (0)], + memcpy (&inferior_registers, &deprecated_registers[DEPRECATED_REGISTER_BYTE (0)], sizeof (inferior_registers)); ptrace (PT_SETREGS, PIDGET (inferior_ptid), (PTRACE_ARG3_TYPE) & inferior_registers, 0); - memcpy (&inferior_fp_registers, &deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + memcpy (&inferior_fp_registers, &deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], sizeof (inferior_fp_registers)); ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), (PTRACE_ARG3_TYPE) & inferior_fp_registers, 0); @@ -77,10 +77,10 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which, struct md_core *core_reg = (struct md_core *) core_reg_sect; /* Integer registers */ - memcpy (&deprecated_registers[REGISTER_BYTE (0)], + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (0)], &core_reg->intreg, sizeof (struct reg)); /* Floating point registers */ - memcpy (&deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], &core_reg->freg, sizeof (struct fpreg)); } diff --git a/gdb/mcore-tdep.c b/gdb/mcore-tdep.c index cec5d3fa4e9..342d5a3dd4a 100644 --- a/gdb/mcore-tdep.c +++ b/gdb/mcore-tdep.c @@ -952,7 +952,7 @@ mcore_use_struct_convention (int gcc_p, struct type *type) static CORE_ADDR mcore_extract_struct_value_address (char *regbuf) { - return extract_unsigned_integer (regbuf + REGISTER_BYTE (FIRST_ARGREG), DEPRECATED_REGISTER_SIZE); + return extract_unsigned_integer (regbuf + DEPRECATED_REGISTER_BYTE (FIRST_ARGREG), DEPRECATED_REGISTER_SIZE); } /* Given a function which returns a value of type TYPE, extract the @@ -965,7 +965,7 @@ mcore_extract_return_value (struct type *type, char *regbuf, char *valbuf) /* Copy the return value (starting) in RETVAL_REGNUM to VALBUF. */ /* Only getting the first byte! if len = 1, we need the last byte of the register, not the first. */ - memcpy (valbuf, regbuf + REGISTER_BYTE (RETVAL_REGNUM) + + memcpy (valbuf, regbuf + DEPRECATED_REGISTER_BYTE (RETVAL_REGNUM) + (TYPE_LENGTH (type) < 4 ? 4 - TYPE_LENGTH (type) : 0), TYPE_LENGTH (type)); } @@ -991,11 +991,11 @@ mcore_store_return_value (struct type *type, char *valbuf) /* Return value fits into registers. */ return_size = (value_size + DEPRECATED_REGISTER_SIZE - 1) & ~(DEPRECATED_REGISTER_SIZE - 1); - offset = REGISTER_BYTE (RETVAL_REGNUM) + (return_size - value_size); + offset = DEPRECATED_REGISTER_BYTE (RETVAL_REGNUM) + (return_size - value_size); zeros = alloca (return_size); memset (zeros, 0, return_size); - deprecated_write_register_bytes (REGISTER_BYTE (RETVAL_REGNUM), zeros, + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (RETVAL_REGNUM), zeros, return_size); deprecated_write_register_bytes (offset, valbuf, value_size); } diff --git a/gdb/mi/ChangeLog b/gdb/mi/ChangeLog index d0ec77316b0..05dad8a2521 100644 --- a/gdb/mi/ChangeLog +++ b/gdb/mi/ChangeLog @@ -1,3 +1,7 @@ +2003-09-17 Andrew Cagney <cagney@redhat.com> + + * mi/mi-main.c: Rename REGISTER_BYTE to DEPRECATED_REGISTER_BYTE. + 2003-09-10 Elena Zannoni <ezannoni@redhat.com> * mi-main.c (mi_setup_architecture_data): Don't use diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index f6fc36e259c..a4d0ab23e2a 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -405,13 +405,13 @@ register_changed_p (int regnum) if (! frame_register_read (deprecated_selected_frame, regnum, raw_buffer)) return -1; - if (memcmp (&old_regs[REGISTER_BYTE (regnum)], raw_buffer, + if (memcmp (&old_regs[DEPRECATED_REGISTER_BYTE (regnum)], raw_buffer, REGISTER_RAW_SIZE (regnum)) == 0) return 0; /* Found a changed register. Return 1. */ - memcpy (&old_regs[REGISTER_BYTE (regnum)], raw_buffer, + memcpy (&old_regs[DEPRECATED_REGISTER_BYTE (regnum)], raw_buffer, REGISTER_RAW_SIZE (regnum)); return 1; @@ -642,7 +642,7 @@ mi_cmd_data_write_register_values (char *command, char **argv, int argc) old_chain = make_cleanup (xfree, buffer); store_signed_integer (buffer, DEPRECATED_REGISTER_SIZE, value); /* Write it down */ - deprecated_write_register_bytes (REGISTER_BYTE (regnum), buffer, REGISTER_RAW_SIZE (regnum)); + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (regnum), buffer, REGISTER_RAW_SIZE (regnum)); /* Free the buffer. */ do_cleanups (old_chain); } diff --git a/gdb/mips-linux-tdep.c b/gdb/mips-linux-tdep.c index 6321935a2df..8f31cf2ad5d 100644 --- a/gdb/mips-linux-tdep.c +++ b/gdb/mips-linux-tdep.c @@ -216,13 +216,13 @@ fill_fpregset (elf_fpregset_t *fpregsetp, int regno) if ((regno >= FP0_REGNUM) && (regno < FP0_REGNUM + 32)) { - from = (char *) &deprecated_registers[REGISTER_BYTE (regno)]; + from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)]; to = (char *) (*fpregsetp + regno - FP0_REGNUM); memcpy (to, from, REGISTER_RAW_SIZE (regno - FP0_REGNUM)); } else if (regno == FCRCS_REGNUM) { - from = (char *) &deprecated_registers[REGISTER_BYTE (regno)]; + from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)]; to = (char *) (*fpregsetp + 32); memcpy (to, from, REGISTER_RAW_SIZE (regno)); } @@ -491,13 +491,13 @@ mips64_fill_fpregset (mips64_elf_fpregset_t *fpregsetp, int regno) if ((regno >= FP0_REGNUM) && (regno < FP0_REGNUM + 32)) { - from = (char *) &deprecated_registers[REGISTER_BYTE (regno)]; + from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)]; to = (char *) (*fpregsetp + regno - FP0_REGNUM); memcpy (to, from, REGISTER_RAW_SIZE (regno - FP0_REGNUM)); } else if (regno == FCRCS_REGNUM) { - from = (char *) &deprecated_registers[REGISTER_BYTE (regno)]; + from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)]; to = (char *) (*fpregsetp + 32); memcpy (to, from, REGISTER_RAW_SIZE (regno)); } diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index 3b5a9a88a81..1d120d7edb9 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -654,7 +654,7 @@ mips_register_raw_size (int regnum) NOTE: cagney/2003-06-15: This is so bogus. The register's raw size is changing according to the ABI (FP_REGISTER_DOUBLE). Also, GDB's protocol is defined by a - combination of REGISTER_RAW_SIZE and REGISTER_BYTE. */ + combination of REGISTER_RAW_SIZE and DEPRECATED_REGISTER_BYTE. */ if (mips64_transfers_32bit_regs_p) return REGISTER_VIRTUAL_SIZE (regnum); else if (regnum >= FP0_REGNUM && regnum < FP0_REGNUM + 32 @@ -4742,12 +4742,12 @@ mips_eabi_extract_return_value (struct type *valtype, return_value_location (valtype, &hi, &lo); memcpy (valbuf + lo.buf_offset, - regbuf + REGISTER_BYTE (lo.reg) + lo.reg_offset, + regbuf + DEPRECATED_REGISTER_BYTE (lo.reg) + lo.reg_offset, lo.len); if (hi.len > 0) memcpy (valbuf + hi.buf_offset, - regbuf + REGISTER_BYTE (hi.reg) + hi.reg_offset, + regbuf + DEPRECATED_REGISTER_BYTE (hi.reg) + hi.reg_offset, hi.len); } @@ -4761,12 +4761,12 @@ mips_o64_extract_return_value (struct type *valtype, return_value_location (valtype, &hi, &lo); memcpy (valbuf + lo.buf_offset, - regbuf + REGISTER_BYTE (lo.reg) + lo.reg_offset, + regbuf + DEPRECATED_REGISTER_BYTE (lo.reg) + lo.reg_offset, lo.len); if (hi.len > 0) memcpy (valbuf + hi.buf_offset, - regbuf + REGISTER_BYTE (hi.reg) + hi.reg_offset, + regbuf + DEPRECATED_REGISTER_BYTE (hi.reg) + hi.reg_offset, hi.len); } @@ -4783,14 +4783,14 @@ mips_eabi_store_return_value (struct type *valtype, char *valbuf) memset (raw_buffer, 0, sizeof (raw_buffer)); memcpy (raw_buffer + lo.reg_offset, valbuf + lo.buf_offset, lo.len); - deprecated_write_register_bytes (REGISTER_BYTE (lo.reg), raw_buffer, + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (lo.reg), raw_buffer, REGISTER_RAW_SIZE (lo.reg)); if (hi.len > 0) { memset (raw_buffer, 0, sizeof (raw_buffer)); memcpy (raw_buffer + hi.reg_offset, valbuf + hi.buf_offset, hi.len); - deprecated_write_register_bytes (REGISTER_BYTE (hi.reg), raw_buffer, + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (hi.reg), raw_buffer, REGISTER_RAW_SIZE (hi.reg)); } } @@ -4805,14 +4805,14 @@ mips_o64_store_return_value (struct type *valtype, char *valbuf) memset (raw_buffer, 0, sizeof (raw_buffer)); memcpy (raw_buffer + lo.reg_offset, valbuf + lo.buf_offset, lo.len); - deprecated_write_register_bytes (REGISTER_BYTE (lo.reg), raw_buffer, + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (lo.reg), raw_buffer, REGISTER_RAW_SIZE (lo.reg)); if (hi.len > 0) { memset (raw_buffer, 0, sizeof (raw_buffer)); memcpy (raw_buffer + hi.reg_offset, valbuf + hi.buf_offset, hi.len); - deprecated_write_register_bytes (REGISTER_BYTE (hi.reg), raw_buffer, + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (hi.reg), raw_buffer, REGISTER_RAW_SIZE (hi.reg)); } } diff --git a/gdb/mipsv4-nat.c b/gdb/mipsv4-nat.c index 30ad06a7ffc..1c753890a85 100644 --- a/gdb/mipsv4-nat.c +++ b/gdb/mipsv4-nat.c @@ -75,19 +75,19 @@ fill_gregset (gregset_t *gregsetp, int regno) for (regi = 0; regi <= 32; regi++) if ((regno == -1) || (regno == regi)) - *(regp + regi) = *(greg_t *) & deprecated_registers[REGISTER_BYTE (regi)]; + *(regp + regi) = *(greg_t *) & deprecated_registers[DEPRECATED_REGISTER_BYTE (regi)]; if ((regno == -1) || (regno == PC_REGNUM)) - *(regp + CXT_EPC) = *(greg_t *) & deprecated_registers[REGISTER_BYTE (PC_REGNUM)]; + *(regp + CXT_EPC) = *(greg_t *) & deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)]; if ((regno == -1) || (regno == CAUSE_REGNUM)) - *(regp + CXT_CAUSE) = *(greg_t *) & deprecated_registers[REGISTER_BYTE (CAUSE_REGNUM)]; + *(regp + CXT_CAUSE) = *(greg_t *) & deprecated_registers[DEPRECATED_REGISTER_BYTE (CAUSE_REGNUM)]; if ((regno == -1) || (regno == HI_REGNUM)) - *(regp + CXT_MDHI) = *(greg_t *) & deprecated_registers[REGISTER_BYTE (HI_REGNUM)]; + *(regp + CXT_MDHI) = *(greg_t *) & deprecated_registers[DEPRECATED_REGISTER_BYTE (HI_REGNUM)]; if ((regno == -1) || (regno == LO_REGNUM)) - *(regp + CXT_MDLO) = *(greg_t *) & deprecated_registers[REGISTER_BYTE (LO_REGNUM)]; + *(regp + CXT_MDLO) = *(greg_t *) & deprecated_registers[DEPRECATED_REGISTER_BYTE (LO_REGNUM)]; } /* @@ -125,14 +125,14 @@ fill_fpregset (fpregset_t *fpregsetp, int regno) { if ((regno == -1) || (regno == regi)) { - from = (char *) &deprecated_registers[REGISTER_BYTE (regi)]; + from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regi)]; to = (char *) &(fpregsetp->fp_r.fp_regs[regi - FP0_REGNUM]); memcpy (to, from, REGISTER_RAW_SIZE (regi)); } } if ((regno == -1) || (regno == FCRCS_REGNUM)) - fpregsetp->fp_csr = *(unsigned *) &deprecated_registers[REGISTER_BYTE (FCRCS_REGNUM)]; + fpregsetp->fp_csr = *(unsigned *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (FCRCS_REGNUM)]; } diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c index 1def419cc34..2385d376294 100644 --- a/gdb/mn10300-tdep.c +++ b/gdb/mn10300-tdep.c @@ -125,15 +125,15 @@ static void mn10300_extract_return_value (struct type *type, char *regbuf, char *valbuf) { if (TYPE_CODE (type) == TYPE_CODE_PTR) - memcpy (valbuf, regbuf + REGISTER_BYTE (4), TYPE_LENGTH (type)); + memcpy (valbuf, regbuf + DEPRECATED_REGISTER_BYTE (4), TYPE_LENGTH (type)); else - memcpy (valbuf, regbuf + REGISTER_BYTE (0), TYPE_LENGTH (type)); + memcpy (valbuf, regbuf + DEPRECATED_REGISTER_BYTE (0), TYPE_LENGTH (type)); } static CORE_ADDR mn10300_extract_struct_value_address (char *regbuf) { - return extract_unsigned_integer (regbuf + REGISTER_BYTE (4), + return extract_unsigned_integer (regbuf + DEPRECATED_REGISTER_BYTE (4), REGISTER_RAW_SIZE (4)); } @@ -141,10 +141,10 @@ static void mn10300_store_return_value (struct type *type, char *valbuf) { if (TYPE_CODE (type) == TYPE_CODE_PTR) - deprecated_write_register_bytes (REGISTER_BYTE (4), valbuf, + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (4), valbuf, TYPE_LENGTH (type)); else - deprecated_write_register_bytes (REGISTER_BYTE (0), valbuf, + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (0), valbuf, TYPE_LENGTH (type)); } diff --git a/gdb/ns32k-tdep.c b/gdb/ns32k-tdep.c index 8809ee439fd..2485276c578 100644 --- a/gdb/ns32k-tdep.c +++ b/gdb/ns32k-tdep.c @@ -483,7 +483,7 @@ static void ns32k_extract_return_value (struct type *valtype, char *regbuf, char *valbuf) { memcpy (valbuf, - regbuf + REGISTER_BYTE (TYPE_CODE (valtype) == TYPE_CODE_FLT ? + regbuf + DEPRECATED_REGISTER_BYTE (TYPE_CODE (valtype) == TYPE_CODE_FLT ? FP0_REGNUM : 0), TYPE_LENGTH (valtype)); } @@ -498,7 +498,7 @@ ns32k_store_return_value (struct type *valtype, char *valbuf) static CORE_ADDR ns32k_extract_struct_value_address (char *regbuf) { - return (extract_unsigned_integer (regbuf + REGISTER_BYTE (0), REGISTER_RAW_SIZE (0))); + return (extract_unsigned_integer (regbuf + DEPRECATED_REGISTER_BYTE (0), REGISTER_RAW_SIZE (0))); } void diff --git a/gdb/ns32knbsd-nat.c b/gdb/ns32knbsd-nat.c index 2fe6d10bb47..2dc7771f345 100644 --- a/gdb/ns32knbsd-nat.c +++ b/gdb/ns32knbsd-nat.c @@ -32,10 +32,10 @@ #include "regcache.h" #define RF(dst, src) \ - memcpy(&deprecated_registers[REGISTER_BYTE(dst)], &src, sizeof(src)) + memcpy(&deprecated_registers[DEPRECATED_REGISTER_BYTE(dst)], &src, sizeof(src)) #define RS(src, dst) \ - memcpy(&dst, &deprecated_registers[REGISTER_BYTE(src)], sizeof(dst)) + memcpy(&dst, &deprecated_registers[DEPRECATED_REGISTER_BYTE(src)], sizeof(dst)) void fetch_inferior_registers (int regno) diff --git a/gdb/ppc-bdm.c b/gdb/ppc-bdm.c index f1898187cf6..2355b2c74eb 100644 --- a/gdb/ppc-bdm.c +++ b/gdb/ppc-bdm.c @@ -295,7 +295,7 @@ bdm_ppc_store_registers (int regno) && ((i < FP0_REGNUM) || (i > FPLAST_REGNUM))) { /* printf("write valid reg %d\n", bdm_regno); */ - ocd_write_bdm_registers (bdm_regno, deprecated_registers + REGISTER_BYTE (i), 4); + ocd_write_bdm_registers (bdm_regno, deprecated_registers + DEPRECATED_REGISTER_BYTE (i), 4); } /* else if (i == gdbarch_tdep (current_gdbarch)->ppc_mq_regnum) diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c index 31341323456..22ebfd2bb2f 100644 --- a/gdb/ppc-linux-tdep.c +++ b/gdb/ppc-linux-tdep.c @@ -591,6 +591,20 @@ ppc_linux_memory_remove_breakpoint (CORE_ADDR addr, char *contents_cache) return val; } +/* For historic reasons, PPC 32 GNU/Linux follows PowerOpen rather + than the 32 bit SYSV R4 ABI structure return convention - all + structures, no matter their size, are put in memory. Vectors, + which were added later, do get returned in a register though. */ + +static int +ppc_linux_use_struct_convention (int gcc_p, struct type *value_type) +{ + if ((TYPE_LENGTH (value_type) == 16 || TYPE_LENGTH (value_type) == 8) + && TYPE_VECTOR (value_type)) + return 0; + return 1; +} + /* Fetch (and possibly build) an appropriate link_map_offsets structure for GNU/Linux PPC targets using the struct offsets defined in link.h (but without actual reference to that file). @@ -1017,15 +1031,17 @@ ppc_linux_init_abi (struct gdbarch_info info, { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - /* Until November 2001, gcc was not complying to the SYSV ABI for - returning structures less than or equal to 8 bytes in size. It was - returning everything in memory. When this was corrected, it wasn't - fixed for native platforms. */ - set_gdbarch_use_struct_convention (gdbarch, - ppc_sysv_abi_broken_use_struct_convention); - if (tdep->wordsize == 4) { + /* Until November 2001, gcc did not comply with the 32 bit SysV + R4 ABI requirement that structures less than or equal to 8 + bytes should be returned in registers. Instead GCC was using + the the AIX/PowerOpen ABI - everything returned in memory + (well ignoring vectors that is). When this was corrected, it + wasn't fixed for GNU/Linux native platform. Use the + PowerOpen struct convention. */ + set_gdbarch_use_struct_convention (gdbarch, ppc_linux_use_struct_convention); + /* Note: kevinb/2002-04-12: See note in rs6000_gdbarch_init regarding *_push_arguments(). The same remarks hold for the methods below. */ set_gdbarch_frameless_function_invocation (gdbarch, diff --git a/gdb/ppc-sysv-tdep.c b/gdb/ppc-sysv-tdep.c index 777cbbc044b..622bc651f2b 100644 --- a/gdb/ppc-sysv-tdep.c +++ b/gdb/ppc-sysv-tdep.c @@ -329,20 +329,6 @@ ppc_sysv_abi_push_dummy_call (struct gdbarch *gdbarch, CORE_ADDR func_addr, return sp; } -/* Until November 2001, gcc was not complying to the SYSV ABI for - returning structures less than or equal to 8 bytes in size. It was - returning everything in memory. When this was corrected, it wasn't - fixed for native platforms. */ -int -ppc_sysv_abi_broken_use_struct_convention (int gcc_p, struct type *value_type) -{ - if ((TYPE_LENGTH (value_type) == 16 || TYPE_LENGTH (value_type) == 8) - && TYPE_VECTOR (value_type)) - return 0; - - return generic_use_struct_convention (gcc_p, value_type); -} - /* Structures 8 bytes or less long are returned in the r3 & r4 registers, according to the SYSV ABI. */ int diff --git a/gdb/ppcnbsd-tdep.c b/gdb/ppcnbsd-tdep.c index 21ab858768e..97323d57249 100644 --- a/gdb/ppcnbsd-tdep.c +++ b/gdb/ppcnbsd-tdep.c @@ -204,12 +204,30 @@ ppcnbsd_pc_in_sigtramp (CORE_ADDR pc, char *func_name) return (nbsd_pc_in_sigtramp (pc, func_name)); } +/* NetBSD is confused. It appears that 1.5 was using the correct SVr4 + convention but, 1.6 switched to the below broken convention. For + the moment use the broken convention. Ulgh!. */ + +static int +ppcnbsd_use_struct_convention (int gcc_p, struct type *value_type) +{ + if ((TYPE_LENGTH (value_type) == 16 || TYPE_LENGTH (value_type) == 8) + && TYPE_VECTOR (value_type)) + return 0; + + return !(TYPE_LENGTH (value_type) == 1 + || TYPE_LENGTH (value_type) == 2 + || TYPE_LENGTH (value_type) == 4 + || TYPE_LENGTH (value_type) == 8); +} + static void ppcnbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { set_gdbarch_pc_in_sigtramp (gdbarch, ppcnbsd_pc_in_sigtramp); + set_gdbarch_use_struct_convention (gdbarch, ppcnbsd_use_struct_convention); set_solib_svr4_fetch_link_map_offsets (gdbarch, nbsd_ilp32_solib_svr4_fetch_link_map_offsets); } diff --git a/gdb/procfs.c b/gdb/procfs.c index 96cdaa9a37d..11fa6f3f109 100644 --- a/gdb/procfs.c +++ b/gdb/procfs.c @@ -3705,7 +3705,7 @@ procfs_fetch_registers (int regno) { if ((regno >= 0 && regno < FP0_REGNUM) || regno == PC_REGNUM || - (NPC_REGNUM >= 0 && regno == NPC_REGNUM) || + (DEPRECATED_NPC_REGNUM >= 0 && regno == DEPRECATED_NPC_REGNUM) || regno == DEPRECATED_FP_REGNUM || regno == SP_REGNUM) return; /* not a floating point register */ @@ -3779,7 +3779,7 @@ procfs_store_registers (int regno) { if ((regno >= 0 && regno < FP0_REGNUM) || regno == PC_REGNUM || - (NPC_REGNUM >= 0 && regno == NPC_REGNUM) || + (DEPRECATED_NPC_REGNUM >= 0 && regno == DEPRECATED_NPC_REGNUM) || regno == DEPRECATED_FP_REGNUM || regno == SP_REGNUM) return; /* not a floating point register */ diff --git a/gdb/regcache.c b/gdb/regcache.c index d59b285e1f7..3561d7c0d81 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -93,12 +93,13 @@ init_legacy_regcache_descr (struct gdbarch *gdbarch, gdb_assert (gdbarch != NULL); /* Compute the offset of each register. Legacy architectures define - REGISTER_BYTE() so use that. */ - /* FIXME: cagney/2002-11-07: Instead of using REGISTER_BYTE() this - code should, as is done in init_regcache_descr(), compute the - offets at runtime. This currently isn't possible as some ISAs - define overlapping register regions - see the mess in - read_register_bytes() and write_register_bytes() registers. */ + DEPRECATED_REGISTER_BYTE() so use that. */ + /* FIXME: cagney/2002-11-07: Instead of using + DEPRECATED_REGISTER_BYTE() this code should, as is done in + init_regcache_descr(), compute the offets at runtime. This + currently isn't possible as some ISAs define overlapping register + regions - see the mess in read_register_bytes() and + write_register_bytes() registers. */ descr->sizeof_register = GDBARCH_OBSTACK_CALLOC (gdbarch, descr->nr_cooked_registers, long); descr->register_offset @@ -106,11 +107,11 @@ init_legacy_regcache_descr (struct gdbarch *gdbarch, for (i = 0; i < descr->nr_cooked_registers; i++) { /* FIXME: cagney/2001-12-04: This code shouldn't need to use - REGISTER_BYTE(). Unfortunatly, legacy code likes to lay the - buffer out so that certain registers just happen to overlap. - Ulgh! New targets use gdbarch's register read/write and - entirely avoid this uglyness. */ - descr->register_offset[i] = REGISTER_BYTE (i); + DEPRECATED_REGISTER_BYTE(). Unfortunatly, legacy code likes + to lay the buffer out so that certain registers just happen + to overlap. Ulgh! New targets use gdbarch's register + read/write and entirely avoid this uglyness. */ + descr->register_offset[i] = DEPRECATED_REGISTER_BYTE (i); descr->sizeof_register[i] = REGISTER_RAW_SIZE (i); gdb_assert (MAX_REGISTER_SIZE >= REGISTER_RAW_SIZE (i)); gdb_assert (MAX_REGISTER_SIZE >= REGISTER_VIRTUAL_SIZE (i)); @@ -130,8 +131,8 @@ init_legacy_regcache_descr (struct gdbarch *gdbarch, /* Keep extending the buffer so that there is always enough space for all registers. The comparison is necessary since legacy code is free to put registers in random places in the - buffer separated by holes. Once REGISTER_BYTE() is killed - this can be greatly simplified. */ + buffer separated by holes. Once DEPRECATED_REGISTER_BYTE() + is killed this can be greatly simplified. */ regend = descr->register_offset[i] + descr->sizeof_register[i]; if (descr->sizeof_cooked_registers < regend) descr->sizeof_cooked_registers = regend; @@ -185,16 +186,17 @@ init_regcache_descr (struct gdbarch *gdbarch) /* If an old style architecture, fill in the remainder of the register cache descriptor using the register macros. */ - /* NOTE: cagney/2003-06-29: If either of REGISTER_BYTE or + /* NOTE: cagney/2003-06-29: If either of DEPRECATED_REGISTER_BYTE or REGISTER_RAW_SIZE are still present, things are most likely totally screwed. Ex: an architecture with raw register sizes - smaller than what REGISTER_BYTE indicates; non monotonic - REGISTER_BYTE values. For GDB 6 check for these nasty methods - and fall back to legacy code when present. Sigh! */ + smaller than what DEPRECATED_REGISTER_BYTE indicates; non + monotonic DEPRECATED_REGISTER_BYTE values. For GDB 6 check for + these nasty methods and fall back to legacy code when present. + Sigh! */ if ((!gdbarch_pseudo_register_read_p (gdbarch) && !gdbarch_pseudo_register_write_p (gdbarch) && !gdbarch_register_type_p (gdbarch)) - || REGISTER_BYTE_P () || REGISTER_RAW_SIZE_P ()) + || DEPRECATED_REGISTER_BYTE_P () || REGISTER_RAW_SIZE_P ()) { descr->legacy_p = 1; init_legacy_regcache_descr (gdbarch, descr); @@ -233,12 +235,12 @@ init_regcache_descr (struct gdbarch *gdbarch) descr->sizeof_raw_registers = descr->sizeof_cooked_registers; /* Sanity check. Confirm that there is agreement between the - regcache and the target's redundant REGISTER_BYTE (new targets - should not even be defining it). */ + regcache and the target's redundant DEPRECATED_REGISTER_BYTE (new + targets should not even be defining it). */ for (i = 0; i < descr->nr_cooked_registers; i++) { - if (REGISTER_BYTE_P ()) - gdb_assert (descr->register_offset[i] == REGISTER_BYTE (i)); + if (DEPRECATED_REGISTER_BYTE_P ()) + gdb_assert (descr->register_offset[i] == DEPRECATED_REGISTER_BYTE (i)); #if 0 gdb_assert (descr->sizeof_register[i] == REGISTER_RAW_SIZE (i)); gdb_assert (descr->sizeof_register[i] == REGISTER_VIRTUAL_SIZE (i)); @@ -650,7 +652,7 @@ deprecated_read_register_bytes (int in_start, char *in_buf, int in_len) int end; int byte; - reg_start = REGISTER_BYTE (regnum); + reg_start = DEPRECATED_REGISTER_BYTE (regnum); reg_len = REGISTER_RAW_SIZE (regnum); reg_end = reg_start + reg_len; @@ -1012,7 +1014,7 @@ deprecated_write_register_bytes (int myregstart, char *myaddr, int inlen) { int regstart, regend; - regstart = REGISTER_BYTE (regnum); + regstart = DEPRECATED_REGISTER_BYTE (regnum); regend = regstart + REGISTER_RAW_SIZE (regnum); /* Is this register completely outside the range the user is writing? */ @@ -1343,8 +1345,8 @@ generic_target_write_pc (CORE_ADDR pc, ptid_t ptid) #ifdef PC_REGNUM if (PC_REGNUM >= 0) write_register_pid (PC_REGNUM, pc, ptid); - if (NPC_REGNUM >= 0) - write_register_pid (NPC_REGNUM, pc + 4, ptid); + if (DEPRECATED_NPC_REGNUM >= 0) + write_register_pid (DEPRECATED_NPC_REGNUM, pc + 4, ptid); #else internal_error (__FILE__, __LINE__, "generic_target_write_pc"); @@ -1517,7 +1519,7 @@ regcache_dump (struct regcache *regcache, struct ui_file *file, fprintf_unfiltered (file, " %6ld", regcache->descr->register_offset[regnum]); if (register_offset != regcache->descr->register_offset[regnum] - || register_offset != REGISTER_BYTE (regnum) + || register_offset != DEPRECATED_REGISTER_BYTE (regnum) || (regnum > 0 && (regcache->descr->register_offset[regnum] != (regcache->descr->register_offset[regnum - 1] diff --git a/gdb/remote-sds.c b/gdb/remote-sds.c index ae397e617d9..a07827c1192 100644 --- a/gdb/remote-sds.c +++ b/gdb/remote-sds.c @@ -499,7 +499,7 @@ sds_fetch_registers (int regno) /* (should warn about reply too short) */ for (i = 0; i < NUM_REGS; i++) - supply_register (i, ®s[REGISTER_BYTE (i)]); + supply_register (i, ®s[DEPRECATED_REGISTER_BYTE (i)]); } /* Prepare to store registers. Since we may send them all, we have to diff --git a/gdb/remote-vx68.c b/gdb/remote-vx68.c index e7f138d1d35..3e21fe6b602 100644 --- a/gdb/remote-vx68.c +++ b/gdb/remote-vx68.c @@ -88,10 +88,10 @@ vx_read_register (int regno) bcopy (&mc68k_greg_packet[MC68K_R_D0], deprecated_registers, 16 * MC68K_GREG_SIZE); bcopy (&mc68k_greg_packet[MC68K_R_SR], - &deprecated_registers[REGISTER_BYTE (PS_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)], MC68K_GREG_SIZE); bcopy (&mc68k_greg_packet[MC68K_R_PC], - &deprecated_registers[REGISTER_BYTE (PC_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)], MC68K_GREG_SIZE); /* Get floating-point registers, if the target system has them. @@ -103,17 +103,17 @@ vx_read_register (int regno) PTRACE_GETFPREGS); bcopy (&mc68k_fpreg_packet[MC68K_R_FP0], - &deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], MC68K_FPREG_SIZE * 8); bcopy (&mc68k_fpreg_packet[MC68K_R_FPCR], - &deprecated_registers[REGISTER_BYTE (FPC_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (FPC_REGNUM)], MC68K_FPREG_PLEN - (MC68K_FPREG_SIZE * 8)); } else { - bzero (&deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + bzero (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], MC68K_FPREG_SIZE * 8); - bzero (&deprecated_registers[REGISTER_BYTE (FPC_REGNUM)], + bzero (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FPC_REGNUM)], MC68K_FPREG_PLEN - (MC68K_FPREG_SIZE * 8)); } @@ -136,9 +136,9 @@ vx_write_register (int regno) bcopy (deprecated_registers, &mc68k_greg_packet[MC68K_R_D0], 16 * MC68K_GREG_SIZE); - bcopy (&deprecated_registers[REGISTER_BYTE (PS_REGNUM)], + bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)], &mc68k_greg_packet[MC68K_R_SR], MC68K_GREG_SIZE); - bcopy (&deprecated_registers[REGISTER_BYTE (PC_REGNUM)], + bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)], &mc68k_greg_packet[MC68K_R_PC], MC68K_GREG_SIZE); net_write_registers (mc68k_greg_packet, MC68K_GREG_PLEN, PTRACE_SETREGS); @@ -147,10 +147,10 @@ vx_write_register (int regno) if (target_has_fp) { - bcopy (&deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], &mc68k_fpreg_packet[MC68K_R_FP0], MC68K_FPREG_SIZE * 8); - bcopy (&deprecated_registers[REGISTER_BYTE (FPC_REGNUM)], + bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FPC_REGNUM)], &mc68k_fpreg_packet[MC68K_R_FPCR], MC68K_FPREG_PLEN - (MC68K_FPREG_SIZE * 8)); diff --git a/gdb/remote-vxmips.c b/gdb/remote-vxmips.c index 441bd9bb2da..28a4070b751 100644 --- a/gdb/remote-vxmips.c +++ b/gdb/remote-vxmips.c @@ -109,13 +109,13 @@ vx_read_register (int regno) /* Copy SR, LO, HI, and PC. */ bcopy (&mips_greg_packet[MIPS_R_SR], - &deprecated_registers[REGISTER_BYTE (PS_REGNUM)], MIPS_GREG_SIZE); + &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)], MIPS_GREG_SIZE); bcopy (&mips_greg_packet[MIPS_R_LO], - &deprecated_registers[REGISTER_BYTE (LO_REGNUM)], MIPS_GREG_SIZE); + &deprecated_registers[DEPRECATED_REGISTER_BYTE (LO_REGNUM)], MIPS_GREG_SIZE); bcopy (&mips_greg_packet[MIPS_R_HI], - &deprecated_registers[REGISTER_BYTE (HI_REGNUM)], MIPS_GREG_SIZE); + &deprecated_registers[DEPRECATED_REGISTER_BYTE (HI_REGNUM)], MIPS_GREG_SIZE); bcopy (&mips_greg_packet[MIPS_R_PC], - &deprecated_registers[REGISTER_BYTE (PC_REGNUM)], MIPS_GREG_SIZE); + &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)], MIPS_GREG_SIZE); /* If the target has floating point registers, fetch them. Otherwise, zero the floating point register values in @@ -130,20 +130,20 @@ vx_read_register (int regno) /* Copy the floating point registers. */ bcopy (&mips_fpreg_packet[MIPS_R_FP0], - &deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], REGISTER_RAW_SIZE (FP0_REGNUM) * 32); /* Copy the floating point control/status register (fpcsr). */ bcopy (&mips_fpreg_packet[MIPS_R_FPCSR], - &deprecated_registers[REGISTER_BYTE (FCRCS_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (FCRCS_REGNUM)], REGISTER_RAW_SIZE (FCRCS_REGNUM)); } else { - bzero ((char *) &deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + bzero ((char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], REGISTER_RAW_SIZE (FP0_REGNUM) * 32); - bzero ((char *) &deprecated_registers[REGISTER_BYTE (FCRCS_REGNUM)], + bzero ((char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (FCRCS_REGNUM)], REGISTER_RAW_SIZE (FCRCS_REGNUM)); } @@ -168,13 +168,13 @@ vx_write_register (int regno) /* Copy SR, LO, HI, and PC. */ - bcopy (&deprecated_registers[REGISTER_BYTE (PS_REGNUM)], + bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)], &mips_greg_packet[MIPS_R_SR], MIPS_GREG_SIZE); - bcopy (&deprecated_registers[REGISTER_BYTE (LO_REGNUM)], + bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (LO_REGNUM)], &mips_greg_packet[MIPS_R_LO], MIPS_GREG_SIZE); - bcopy (&deprecated_registers[REGISTER_BYTE (HI_REGNUM)], + bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (HI_REGNUM)], &mips_greg_packet[MIPS_R_HI], MIPS_GREG_SIZE); - bcopy (&deprecated_registers[REGISTER_BYTE (PC_REGNUM)], + bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)], &mips_greg_packet[MIPS_R_PC], MIPS_GREG_SIZE); net_write_registers (mips_greg_packet, MIPS_GREG_PLEN, PTRACE_SETREGS); @@ -185,13 +185,13 @@ vx_write_register (int regno) { /* Copy the floating point data registers. */ - bcopy (&deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], &mips_fpreg_packet[MIPS_R_FP0], REGISTER_RAW_SIZE (FP0_REGNUM) * 32); /* Copy the floating point control/status register (fpcsr). */ - bcopy (&deprecated_registers[REGISTER_BYTE (FCRCS_REGNUM)], + bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FCRCS_REGNUM)], &mips_fpreg_packet[MIPS_R_FPCSR], REGISTER_RAW_SIZE (FCRCS_REGNUM)); diff --git a/gdb/remote-vxsparc.c b/gdb/remote-vxsparc.c index 8b554282194..339b99ff298 100644 --- a/gdb/remote-vxsparc.c +++ b/gdb/remote-vxsparc.c @@ -92,18 +92,18 @@ vx_read_register (int regno) as defined in "tm-sparc.h". */ bcopy (&sparc_greg_packet[SPARC_R_G0], - &deprecated_registers[REGISTER_BYTE (G0_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (G0_REGNUM)], 32 * SPARC_GREG_SIZE); bcopy (&sparc_greg_packet[SPARC_R_Y], - &deprecated_registers[REGISTER_BYTE (Y_REGNUM)], 6 * SPARC_GREG_SIZE); + &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)], 6 * SPARC_GREG_SIZE); /* Now write the local and in registers to the register window spill area in the frame. VxWorks does not do this for the active frame automatically; it greatly simplifies debugging. */ - sp = extract_unsigned_integer (&deprecated_registers[REGISTER_BYTE (SP_REGNUM)], + sp = extract_unsigned_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (SP_REGNUM)], REGISTER_RAW_SIZE (SP_REGNUM)); - write_memory (sp, &deprecated_registers[REGISTER_BYTE (L0_REGNUM)], + write_memory (sp, &deprecated_registers[DEPRECATED_REGISTER_BYTE (L0_REGNUM)], 16 * REGISTER_RAW_SIZE (L0_REGNUM)); /* If the target has floating point registers, fetch them. @@ -116,17 +116,17 @@ vx_read_register (int regno) net_read_registers (sparc_fpreg_packet, SPARC_FPREG_PLEN, PTRACE_GETFPREGS); bcopy (&sparc_fpreg_packet[SPARC_R_FP0], - &deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], 32 * SPARC_FPREG_SIZE); bcopy (&sparc_fpreg_packet[SPARC_R_FSR], - &deprecated_registers[REGISTER_BYTE (FPS_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (FPS_REGNUM)], 1 * SPARC_FPREG_SIZE); } else { - bzero (&deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + bzero (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], 32 * SPARC_FPREG_SIZE); - bzero (&deprecated_registers[REGISTER_BYTE (FPS_REGNUM)], + bzero (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FPS_REGNUM)], 1 * SPARC_FPREG_SIZE); } @@ -157,16 +157,16 @@ vx_write_register (int regno) if (regno >= 0) { if ((G0_REGNUM <= regno && regno <= I7_REGNUM) - || (Y_REGNUM <= regno && regno <= NPC_REGNUM)) + || (Y_REGNUM <= regno && regno <= DEPRECATED_NPC_REGNUM)) in_fp_regs = 0; else in_gp_regs = 0; } if (in_gp_regs) { - bcopy (&deprecated_registers[REGISTER_BYTE (G0_REGNUM)], + bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (G0_REGNUM)], &sparc_greg_packet[SPARC_R_G0], 32 * SPARC_GREG_SIZE); - bcopy (&deprecated_registers[REGISTER_BYTE (Y_REGNUM)], + bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)], &sparc_greg_packet[SPARC_R_Y], 6 * SPARC_GREG_SIZE); net_write_registers (sparc_greg_packet, SPARC_GREG_PLEN, PTRACE_SETREGS); @@ -176,9 +176,9 @@ vx_write_register (int regno) if (regno < 0 || (L0_REGNUM <= regno && regno <= I7_REGNUM)) { - sp = extract_unsigned_integer (&deprecated_registers[REGISTER_BYTE (SP_REGNUM)], + sp = extract_unsigned_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (SP_REGNUM)], REGISTER_RAW_SIZE (SP_REGNUM)); - write_memory (sp, &deprecated_registers[REGISTER_BYTE (L0_REGNUM)], + write_memory (sp, &deprecated_registers[DEPRECATED_REGISTER_BYTE (L0_REGNUM)], 16 * REGISTER_RAW_SIZE (L0_REGNUM)); } } @@ -187,9 +187,9 @@ vx_write_register (int regno) if (in_fp_regs && target_has_fp) { - bcopy (&deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], &sparc_fpreg_packet[SPARC_R_FP0], 32 * SPARC_FPREG_SIZE); - bcopy (&deprecated_registers[REGISTER_BYTE (FPS_REGNUM)], + bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FPS_REGNUM)], &sparc_fpreg_packet[SPARC_R_FSR], 1 * SPARC_FPREG_SIZE); net_write_registers (sparc_fpreg_packet, SPARC_FPREG_PLEN, diff --git a/gdb/remote.c b/gdb/remote.c index 73906c7c719..dd16354c597 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -271,7 +271,7 @@ init_remote_state (struct gdbarch *gdbarch) struct packet_reg *r = &rs->regs[regnum]; r->pnum = regnum; r->regnum = regnum; - r->offset = REGISTER_BYTE (regnum); + r->offset = DEPRECATED_REGISTER_BYTE (regnum); r->in_g_packet = (regnum < NUM_REGS); /* ...name = REGISTER_NAME (regnum); */ diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index a631ffc37e8..0d663b753c6 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -1054,7 +1054,7 @@ rs6000_pop_frame (void) addr = prev_sp + fdata.gpr_offset; for (ii = fdata.saved_gpr; ii <= 31; ++ii) { - read_memory (addr, &deprecated_registers[REGISTER_BYTE (ii)], + read_memory (addr, &deprecated_registers[DEPRECATED_REGISTER_BYTE (ii)], wordsize); addr += wordsize; } @@ -1065,7 +1065,7 @@ rs6000_pop_frame (void) addr = prev_sp + fdata.fpr_offset; for (ii = fdata.saved_fpr; ii <= 31; ++ii) { - read_memory (addr, &deprecated_registers[REGISTER_BYTE (ii + FP0_REGNUM)], 8); + read_memory (addr, &deprecated_registers[DEPRECATED_REGISTER_BYTE (ii + FP0_REGNUM)], 8); addr += 8; } } @@ -1171,7 +1171,7 @@ rs6000_push_dummy_call (struct gdbarch *gdbarch, CORE_ADDR func_addr, printf_unfiltered ( "Fatal Error: a floating point parameter #%d with a size > 8 is found!\n", argno); - memcpy (&deprecated_registers[REGISTER_BYTE (FP0_REGNUM + 1 + f_argno)], + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM + 1 + f_argno)], VALUE_CONTENTS (arg), len); ++f_argno; @@ -1183,9 +1183,9 @@ rs6000_push_dummy_call (struct gdbarch *gdbarch, CORE_ADDR func_addr, /* Argument takes more than one register. */ while (argbytes < len) { - memset (&deprecated_registers[REGISTER_BYTE (ii + 3)], 0, + memset (&deprecated_registers[DEPRECATED_REGISTER_BYTE (ii + 3)], 0, reg_size); - memcpy (&deprecated_registers[REGISTER_BYTE (ii + 3)], + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (ii + 3)], ((char *) VALUE_CONTENTS (arg)) + argbytes, (len - argbytes) > reg_size ? reg_size : len - argbytes); @@ -1201,8 +1201,8 @@ rs6000_push_dummy_call (struct gdbarch *gdbarch, CORE_ADDR func_addr, { /* Argument can fit in one register. No problem. */ int adj = TARGET_BYTE_ORDER == BFD_ENDIAN_BIG ? reg_size - len : 0; - memset (&deprecated_registers[REGISTER_BYTE (ii + 3)], 0, reg_size); - memcpy ((char *)&deprecated_registers[REGISTER_BYTE (ii + 3)] + adj, + memset (&deprecated_registers[DEPRECATED_REGISTER_BYTE (ii + 3)], 0, reg_size); + memcpy ((char *)&deprecated_registers[DEPRECATED_REGISTER_BYTE (ii + 3)] + adj, VALUE_CONTENTS (arg), len); } ++argno; @@ -1276,7 +1276,7 @@ ran_out_of_registers_for_arguments: printf_unfiltered ( "Fatal Error: a floating point parameter #%d with a size > 8 is found!\n", argno); - memcpy (&deprecated_registers[REGISTER_BYTE (FP0_REGNUM + 1 + f_argno)], + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM + 1 + f_argno)], VALUE_CONTENTS (arg), len); ++f_argno; @@ -1372,6 +1372,18 @@ e500_extract_return_value (struct type *valtype, struct regcache *regbuf, void * } } +/* PowerOpen always puts structures in memory. Vectors, which were + added later, do get returned in a register though. */ + +static int +rs6000_use_struct_convention (int gcc_p, struct type *value_type) +{ + if ((TYPE_LENGTH (value_type) == 16 || TYPE_LENGTH (value_type) == 8) + && TYPE_VECTOR (value_type)) + return 0; + return 1; +} + static void rs6000_extract_return_value (struct type *valtype, char *regbuf, char *valbuf) { @@ -1389,11 +1401,11 @@ rs6000_extract_return_value (struct type *valtype, char *regbuf, char *valbuf) if (TYPE_LENGTH (valtype) > 4) /* this is a double */ memcpy (valbuf, - ®buf[REGISTER_BYTE (FP0_REGNUM + 1)], + ®buf[DEPRECATED_REGISTER_BYTE (FP0_REGNUM + 1)], TYPE_LENGTH (valtype)); else { /* float */ - memcpy (&dd, ®buf[REGISTER_BYTE (FP0_REGNUM + 1)], 8); + memcpy (&dd, ®buf[DEPRECATED_REGISTER_BYTE (FP0_REGNUM + 1)], 8); ff = (float) dd; memcpy (valbuf, &ff, sizeof (float)); } @@ -1402,7 +1414,7 @@ rs6000_extract_return_value (struct type *valtype, char *regbuf, char *valbuf) && TYPE_LENGTH (valtype) == 16 && TYPE_VECTOR (valtype)) { - memcpy (valbuf, regbuf + REGISTER_BYTE (tdep->ppc_vr0_regnum + 2), + memcpy (valbuf, regbuf + DEPRECATED_REGISTER_BYTE (tdep->ppc_vr0_regnum + 2), TYPE_LENGTH (valtype)); } else @@ -1413,7 +1425,7 @@ rs6000_extract_return_value (struct type *valtype, char *regbuf, char *valbuf) offset = REGISTER_RAW_SIZE (3) - TYPE_LENGTH (valtype); memcpy (valbuf, - regbuf + REGISTER_BYTE (3) + offset, + regbuf + DEPRECATED_REGISTER_BYTE (3) + offset, TYPE_LENGTH (valtype)); } } @@ -2069,18 +2081,18 @@ rs6000_store_return_value (struct type *type, char *valbuf) Say a double_double_double type could be returned in FPR1/FPR2/FPR3 triple. */ - deprecated_write_register_bytes (REGISTER_BYTE (FP0_REGNUM + 1), valbuf, + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (FP0_REGNUM + 1), valbuf, TYPE_LENGTH (type)); else if (TYPE_CODE (type) == TYPE_CODE_ARRAY) { if (TYPE_LENGTH (type) == 16 && TYPE_VECTOR (type)) - deprecated_write_register_bytes (REGISTER_BYTE (tdep->ppc_vr0_regnum + 2), + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (tdep->ppc_vr0_regnum + 2), valbuf, TYPE_LENGTH (type)); } else /* Everything else is returned in GPR3 and up. */ - deprecated_write_register_bytes (REGISTER_BYTE (gdbarch_tdep (current_gdbarch)->ppc_gp0_regnum + 3), + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (gdbarch_tdep (current_gdbarch)->ppc_gp0_regnum + 3), valbuf, TYPE_LENGTH (type)); } @@ -2957,7 +2969,7 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) ppc_sysv_abi_use_struct_convention); else set_gdbarch_use_struct_convention (gdbarch, - generic_use_struct_convention); + rs6000_use_struct_convention); set_gdbarch_frameless_function_invocation (gdbarch, rs6000_frameless_function_invocation); diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index bc82646b57f..ee6574d9557 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -903,7 +903,7 @@ s390_get_signal_frame_info (struct frame_info *fi) /* We're definitely backtracing from a signal handler. */ CORE_ADDR *saved_regs = get_frame_saved_regs (fi); CORE_ADDR save_reg_addr = (get_frame_extra_info (next_frame)->sigcontext - + REGISTER_BYTE (S390_GP0_REGNUM)); + + DEPRECATED_REGISTER_BYTE (S390_GP0_REGNUM)); int reg; for (reg = 0; reg < S390_NUM_GPRS; reg++) @@ -1662,8 +1662,7 @@ s390_is_sigreturn (CORE_ADDR pc, struct frame_info *sighandler_fi, *sigcaller_pc = ADDR_BITS_REMOVE ((CORE_ADDR) read_memory_integer (temp_sregs + - REGISTER_BYTE - (S390_PC_REGNUM), + DEPRECATED_REGISTER_BYTE (S390_PC_REGNUM), S390_PSW_ADDR_SIZE)); } } @@ -1833,7 +1832,7 @@ s390_frame_chain (struct frame_info *thisframe) { /* read sigregs,regs.gprs[11 or 15] */ prev_fp = read_memory_integer (sregs + - REGISTER_BYTE (S390_GP0_REGNUM + + DEPRECATED_REGISTER_BYTE (S390_GP0_REGNUM + (prev_fextra_info. frame_pointer_saved_pc ? 11 : 15)), @@ -1886,7 +1885,7 @@ s390_extract_return_value (struct type *valtype, char *regbuf, char *valbuf) int len = TYPE_LENGTH (valtype); if (TYPE_CODE (valtype) == TYPE_CODE_FLT) - memcpy (valbuf, ®buf[REGISTER_BYTE (S390_FP0_REGNUM)], len); + memcpy (valbuf, ®buf[DEPRECATED_REGISTER_BYTE (S390_FP0_REGNUM)], len); else { int offset = 0; @@ -1894,7 +1893,7 @@ s390_extract_return_value (struct type *valtype, char *regbuf, char *valbuf) if (TYPE_LENGTH (valtype) < S390_GPR_SIZE) offset = S390_GPR_SIZE - TYPE_LENGTH (valtype); memcpy (valbuf, - regbuf + REGISTER_BYTE (S390_GP0_REGNUM + 2) + offset, + regbuf + DEPRECATED_REGISTER_BYTE (S390_GP0_REGNUM + 2) + offset, TYPE_LENGTH (valtype)); } } @@ -1945,7 +1944,7 @@ s390_store_return_value (struct type *valtype, char *valbuf) { if (TYPE_LENGTH (valtype) == 4 || TYPE_LENGTH (valtype) == 8) - deprecated_write_register_bytes (REGISTER_BYTE (S390_FP0_REGNUM), + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (S390_FP0_REGNUM), valbuf, TYPE_LENGTH (valtype)); else error ("GDB is unable to return `long double' values " @@ -1956,7 +1955,7 @@ s390_store_return_value (struct type *valtype, char *valbuf) value = s390_promote_integer_argument (valtype, valbuf, reg_buff, &arglen); /* Everything else is returned in GPR2 and up. */ - deprecated_write_register_bytes (REGISTER_BYTE (S390_GP0_REGNUM + 2), + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (S390_GP0_REGNUM + 2), value, arglen); } } @@ -2363,7 +2362,7 @@ s390_push_arguments (int nargs, struct value **args, CORE_ADDR sp, { /* When we store a single-precision value in an FP register, it occupies the leftmost bits. */ - deprecated_write_register_bytes (REGISTER_BYTE (S390_FP0_REGNUM + fr), + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (S390_FP0_REGNUM + fr), VALUE_CONTENTS (arg), TYPE_LENGTH (type)); fr += 2; diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c index dc0ecc7be38..99372b8b032 100644 --- a/gdb/sh64-tdep.c +++ b/gdb/sh64-tdep.c @@ -1292,7 +1292,7 @@ sh64_get_saved_register (char *raw_buffer, int *optimized, CORE_ADDR *addrp, if (raw_buffer) memcpy (raw_buffer, (deprecated_generic_find_dummy_frame (get_frame_pc (frame), get_frame_base (frame)) - + REGISTER_BYTE (regnum)), + + DEPRECATED_REGISTER_BYTE (regnum)), REGISTER_RAW_SIZE (regnum)); return; } @@ -1343,7 +1343,7 @@ sh64_get_saved_register (char *raw_buffer, int *optimized, CORE_ADDR *addrp, if (lval) /* found it in a live register */ *lval = lval_register; if (addrp) - *addrp = REGISTER_BYTE (live_regnum); + *addrp = DEPRECATED_REGISTER_BYTE (live_regnum); if (raw_buffer) deprecated_read_register_gen (live_regnum, raw_buffer); } @@ -1351,7 +1351,7 @@ sh64_get_saved_register (char *raw_buffer, int *optimized, CORE_ADDR *addrp, static CORE_ADDR sh64_extract_struct_value_address (char *regbuf) { - return (extract_unsigned_integer ((regbuf + REGISTER_BYTE (STRUCT_RETURN_REGNUM)), + return (extract_unsigned_integer ((regbuf + DEPRECATED_REGISTER_BYTE (STRUCT_RETURN_REGNUM)), REGISTER_RAW_SIZE (STRUCT_RETURN_REGNUM))); } @@ -1673,7 +1673,7 @@ sh64_extract_return_value (struct type *type, char *regbuf, char *valbuf) { /* Return value stored in FP0_REGNUM */ return_register = FP0_REGNUM; - offset = REGISTER_BYTE (return_register); + offset = DEPRECATED_REGISTER_BYTE (return_register); memcpy (valbuf, (char *) regbuf + offset, len); } else if (len == 8) @@ -1682,7 +1682,7 @@ sh64_extract_return_value (struct type *type, char *regbuf, char *valbuf) DOUBLEST val; return_register = DR0_REGNUM; - offset = REGISTER_BYTE (return_register); + offset = DEPRECATED_REGISTER_BYTE (return_register); if (TARGET_BYTE_ORDER == BFD_ENDIAN_LITTLE) floatformat_to_doublest (&floatformat_ieee_double_littlebyte_bigword, @@ -1701,10 +1701,10 @@ sh64_extract_return_value (struct type *type, char *regbuf, char *valbuf) at the most significant end. */ return_register = DEFAULT_RETURN_REGNUM; if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) - offset = REGISTER_BYTE (return_register) + + offset = DEPRECATED_REGISTER_BYTE (return_register) + REGISTER_RAW_SIZE (return_register) - len; else - offset = REGISTER_BYTE (return_register); + offset = DEPRECATED_REGISTER_BYTE (return_register); memcpy (valbuf, (char *) regbuf + offset, len); } else diff --git a/gdb/sparc-linux-nat.c b/gdb/sparc-linux-nat.c index 261ed6061cc..f43cb593b20 100644 --- a/gdb/sparc-linux-nat.c +++ b/gdb/sparc-linux-nat.c @@ -40,7 +40,7 @@ supply_gregset (elf_gregset_t *gregsetp) supply_register (PS_REGNUM, (char *) (regp + 32)); supply_register (PC_REGNUM, (char *) (regp + 33)); - supply_register (NPC_REGNUM, (char *) (regp + 34)); + supply_register (DEPRECATED_NPC_REGNUM, (char *) (regp + 34)); supply_register (Y_REGNUM, (char *) (regp + 35)); supply_register (WIM_REGNUM, (char *) (regp + 36)); @@ -65,8 +65,8 @@ fill_gregset (elf_gregset_t *gregsetp, int regno) if (regno == -1 || regno == PC_REGNUM) regcache_collect (PC_REGNUM, regp + 33); - if (regno == -1 || regno == NPC_REGNUM) - regcache_collect (NPC_REGNUM, regp + 34); + if (regno == -1 || regno == DEPRECATED_NPC_REGNUM) + regcache_collect (DEPRECATED_NPC_REGNUM, regp + 34); if (regno == -1 || regno == Y_REGNUM) regcache_collect (Y_REGNUM, regp + 35); diff --git a/gdb/sparc-nat.c b/gdb/sparc-nat.c index 540bbcc9e3b..a4df86507b7 100644 --- a/gdb/sparc-nat.c +++ b/gdb/sparc-nat.c @@ -101,23 +101,23 @@ fetch_inferior_registers (int regno) (PTRACE_ARG3_TYPE) & inferior_registers, 0)) perror ("ptrace_getregs"); - deprecated_registers[REGISTER_BYTE (0)] = 0; - memcpy (&deprecated_registers[REGISTER_BYTE (1)], + deprecated_registers[DEPRECATED_REGISTER_BYTE (0)] = 0; + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (1)], &inferior_registers.r_g1, 15 * REGISTER_RAW_SIZE (G0_REGNUM)); - *(int *) &deprecated_registers[REGISTER_BYTE (PS_REGNUM)] + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)] = inferior_registers.r_ps; - *(int *) &deprecated_registers[REGISTER_BYTE (PC_REGNUM)] + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)] = inferior_registers.r_pc; - *(int *) &deprecated_registers[REGISTER_BYTE (NPC_REGNUM)] + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (DEPRECATED_NPC_REGNUM)] = inferior_registers.r_npc; - *(int *) &deprecated_registers[REGISTER_BYTE (Y_REGNUM)] = inferior_registers.r_y; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)] = inferior_registers.r_y; for (i = G0_REGNUM; i <= O7_REGNUM; i++) deprecated_register_valid[i] = 1; deprecated_register_valid[Y_REGNUM] = 1; deprecated_register_valid[PS_REGNUM] = 1; deprecated_register_valid[PC_REGNUM] = 1; - deprecated_register_valid[NPC_REGNUM] = 1; + deprecated_register_valid[DEPRECATED_NPC_REGNUM] = 1; /* If we don't set these valid, read_register_bytes() rereads all the regs every time it is called! FIXME. */ deprecated_register_valid[WIM_REGNUM] = 1; /* Not true yet, FIXME */ @@ -134,9 +134,9 @@ fetch_inferior_registers (int regno) (PTRACE_ARG3_TYPE) & inferior_fp_registers, 0)) perror ("ptrace_getfpregs"); - memcpy (&deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], &inferior_fp_registers, sizeof inferior_fp_registers.fpu_fr); - memcpy (&deprecated_registers[REGISTER_BYTE (FPS_REGNUM)], + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FPS_REGNUM)], &inferior_fp_registers.Fpu_fsr, sizeof (FPU_FSR_TYPE)); for (i = FP0_REGNUM; i <= FP0_REGNUM + 31; i++) deprecated_register_valid[i] = 1; @@ -147,19 +147,19 @@ fetch_inferior_registers (int regno) all (16 ptrace calls!) if we really need them. */ if (regno == -1) { - CORE_ADDR sp = *(unsigned int *) & deprecated_registers[REGISTER_BYTE (SP_REGNUM)]; - target_read_memory (sp, &deprecated_registers[REGISTER_BYTE (L0_REGNUM)], + CORE_ADDR sp = *(unsigned int *) & deprecated_registers[DEPRECATED_REGISTER_BYTE (SP_REGNUM)]; + target_read_memory (sp, &deprecated_registers[DEPRECATED_REGISTER_BYTE (L0_REGNUM)], 16 * REGISTER_RAW_SIZE (L0_REGNUM)); for (i = L0_REGNUM; i <= I7_REGNUM; i++) deprecated_register_valid[i] = 1; } else if (regno >= L0_REGNUM && regno <= I7_REGNUM) { - CORE_ADDR sp = *(unsigned int *) & deprecated_registers[REGISTER_BYTE (SP_REGNUM)]; - i = REGISTER_BYTE (regno); + CORE_ADDR sp = *(unsigned int *) & deprecated_registers[DEPRECATED_REGISTER_BYTE (SP_REGNUM)]; + i = DEPRECATED_REGISTER_BYTE (regno); if (deprecated_register_valid[regno]) printf_unfiltered ("register %d valid and read\n", regno); - target_read_memory (sp + i - REGISTER_BYTE (L0_REGNUM), + target_read_memory (sp + i - DEPRECATED_REGISTER_BYTE (L0_REGNUM), &deprecated_registers[i], REGISTER_RAW_SIZE (regno)); deprecated_register_valid[regno] = 1; } @@ -226,22 +226,22 @@ store_inferior_registers (int regno) if (wanna_store & STACK_REGS) { - CORE_ADDR sp = *(unsigned int *) & deprecated_registers[REGISTER_BYTE (SP_REGNUM)]; + CORE_ADDR sp = *(unsigned int *) & deprecated_registers[DEPRECATED_REGISTER_BYTE (SP_REGNUM)]; if (regno < 0 || regno == SP_REGNUM) { if (!deprecated_register_valid[L0_REGNUM + 5]) internal_error (__FILE__, __LINE__, "failed internal consistency check"); target_write_memory (sp, - &deprecated_registers[REGISTER_BYTE (L0_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (L0_REGNUM)], 16 * REGISTER_RAW_SIZE (L0_REGNUM)); } else { if (!deprecated_register_valid[regno]) internal_error (__FILE__, __LINE__, "failed internal consistency check"); - target_write_memory (sp + REGISTER_BYTE (regno) - REGISTER_BYTE (L0_REGNUM), - &deprecated_registers[REGISTER_BYTE (regno)], + target_write_memory (sp + DEPRECATED_REGISTER_BYTE (regno) - DEPRECATED_REGISTER_BYTE (L0_REGNUM), + &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)], REGISTER_RAW_SIZE (regno)); } @@ -253,17 +253,17 @@ store_inferior_registers (int regno) internal_error (__FILE__, __LINE__, "failed internal consistency check"); memcpy (&inferior_registers.r_g1, - &deprecated_registers[REGISTER_BYTE (G1_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (G1_REGNUM)], 15 * REGISTER_RAW_SIZE (G1_REGNUM)); inferior_registers.r_ps = - *(int *) &deprecated_registers[REGISTER_BYTE (PS_REGNUM)]; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)]; inferior_registers.r_pc = - *(int *) &deprecated_registers[REGISTER_BYTE (PC_REGNUM)]; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)]; inferior_registers.r_npc = - *(int *) &deprecated_registers[REGISTER_BYTE (NPC_REGNUM)]; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (DEPRECATED_NPC_REGNUM)]; inferior_registers.r_y = - *(int *) &deprecated_registers[REGISTER_BYTE (Y_REGNUM)]; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)]; if (0 != ptrace (PTRACE_SETREGS, store_pid, (PTRACE_ARG3_TYPE) & inferior_registers, 0)) @@ -275,10 +275,10 @@ store_inferior_registers (int regno) if (!deprecated_register_valid[FP0_REGNUM + 9]) internal_error (__FILE__, __LINE__, "failed internal consistency check"); memcpy (&inferior_fp_registers, - &deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], sizeof inferior_fp_registers.fpu_fr); memcpy (&inferior_fp_registers.Fpu_fsr, - &deprecated_registers[REGISTER_BYTE (FPS_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (FPS_REGNUM)], sizeof (FPU_FSR_TYPE)); if (0 != ptrace (PTRACE_SETFPREGS, store_pid, @@ -311,15 +311,15 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, #define gregs ((struct regs *)core_reg_sect) /* G0 *always* holds 0. */ - *(int *) &deprecated_registers[REGISTER_BYTE (0)] = 0; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (0)] = 0; /* The globals and output registers. */ - memcpy (&deprecated_registers[REGISTER_BYTE (G1_REGNUM)], &gregs->r_g1, + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (G1_REGNUM)], &gregs->r_g1, 15 * REGISTER_RAW_SIZE (G1_REGNUM)); - *(int *) &deprecated_registers[REGISTER_BYTE (PS_REGNUM)] = gregs->r_ps; - *(int *) &deprecated_registers[REGISTER_BYTE (PC_REGNUM)] = gregs->r_pc; - *(int *) &deprecated_registers[REGISTER_BYTE (NPC_REGNUM)] = gregs->r_npc; - *(int *) &deprecated_registers[REGISTER_BYTE (Y_REGNUM)] = gregs->r_y; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)] = gregs->r_ps; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)] = gregs->r_pc; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (DEPRECATED_NPC_REGNUM)] = gregs->r_npc; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)] = gregs->r_y; /* My best guess at where to get the locals and input registers is exactly where they usually are, right above @@ -329,9 +329,9 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, { int sp; - sp = *(int *) &deprecated_registers[REGISTER_BYTE (SP_REGNUM)]; + sp = *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (SP_REGNUM)]; if (0 != target_read_memory (sp, - &deprecated_registers[REGISTER_BYTE (L0_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (L0_REGNUM)], 16 * REGISTER_RAW_SIZE (L0_REGNUM))) { /* fprintf_unfiltered so user can still use gdb */ @@ -348,9 +348,9 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, #define fpuregs ((struct fpu *) core_reg_sect) if (core_reg_size >= sizeof (struct fpu)) { - memcpy (&deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], fpuregs->fpu_regs, sizeof (fpuregs->fpu_regs)); - memcpy (&deprecated_registers[REGISTER_BYTE (FPS_REGNUM)], + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FPS_REGNUM)], &fpuregs->fpu_fsr, sizeof (FPU_FSR_TYPE)); } else diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c index 6d1a9269cb3..3a81821881c 100644 --- a/gdb/sparc-tdep.c +++ b/gdb/sparc-tdep.c @@ -168,7 +168,7 @@ typedef enum Beihl (beihl@mcc.com). */ /* npc4 and next_pc describe the situation at the time that the - step-breakpoint was set, not necessary the current value of NPC_REGNUM. */ + step-breakpoint was set, not necessary the current value of DEPRECATED_NPC_REGNUM. */ static CORE_ADDR next_pc, npc4, target; static int brknpc4, brktrg; typedef char binsn_quantum[BREAKPOINT_MAX]; @@ -195,7 +195,7 @@ sparc_software_single_step (enum target_signal ignore, /* pid, but we don't need if (insert_breakpoints_p) { /* Always set breakpoint for NPC. */ - next_pc = read_register (NPC_REGNUM); + next_pc = read_register (DEPRECATED_NPC_REGNUM); npc4 = next_pc + 4; /* branch not taken */ target_insert_breakpoint (next_pc, break_mem[0]); @@ -936,7 +936,7 @@ sparc_get_saved_register (char *raw_buffer, int *optimized, CORE_ADDR *addrp, { if (lval != NULL) *lval = lval_register; - addr = REGISTER_BYTE (regnum); + addr = DEPRECATED_REGISTER_BYTE (regnum); if (raw_buffer != NULL) deprecated_read_register_gen (regnum, raw_buffer); } @@ -972,10 +972,10 @@ sparc_push_dummy_frame (void) if (GDB_TARGET_IS_SPARC64) { /* PC, NPC, CCR, FSR, FPRS, Y, ASI */ - deprecated_read_register_bytes (REGISTER_BYTE (PC_REGNUM), + deprecated_read_register_bytes (DEPRECATED_REGISTER_BYTE (PC_REGNUM), ®ister_temp[0], REGISTER_RAW_SIZE (PC_REGNUM) * 7); - deprecated_read_register_bytes (REGISTER_BYTE (PSTATE_REGNUM), + deprecated_read_register_bytes (DEPRECATED_REGISTER_BYTE (PSTATE_REGNUM), ®ister_temp[7 * SPARC_INTREG_SIZE], REGISTER_RAW_SIZE (PSTATE_REGNUM)); /* FIXME: not sure what needs to be saved here. */ @@ -983,21 +983,21 @@ sparc_push_dummy_frame (void) else { /* Y, PS, WIM, TBR, PC, NPC, FPS, CPS regs */ - deprecated_read_register_bytes (REGISTER_BYTE (Y_REGNUM), + deprecated_read_register_bytes (DEPRECATED_REGISTER_BYTE (Y_REGNUM), ®ister_temp[0], REGISTER_RAW_SIZE (Y_REGNUM) * 8); } - deprecated_read_register_bytes (REGISTER_BYTE (O0_REGNUM), + deprecated_read_register_bytes (DEPRECATED_REGISTER_BYTE (O0_REGNUM), ®ister_temp[8 * SPARC_INTREG_SIZE], SPARC_INTREG_SIZE * 8); - deprecated_read_register_bytes (REGISTER_BYTE (G0_REGNUM), + deprecated_read_register_bytes (DEPRECATED_REGISTER_BYTE (G0_REGNUM), ®ister_temp[16 * SPARC_INTREG_SIZE], SPARC_INTREG_SIZE * 8); if (SPARC_HAS_FPU) - deprecated_read_register_bytes (REGISTER_BYTE (FP0_REGNUM), + deprecated_read_register_bytes (DEPRECATED_REGISTER_BYTE (FP0_REGNUM), ®ister_temp[24 * SPARC_INTREG_SIZE], FP_REGISTER_BYTES); @@ -1224,7 +1224,7 @@ sparc_pop_frame (void) if (fsr[FP0_REGNUM]) { read_memory (fsr[FP0_REGNUM], raw_buffer, FP_REGISTER_BYTES); - deprecated_write_register_bytes (REGISTER_BYTE (FP0_REGNUM), + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (FP0_REGNUM), raw_buffer, FP_REGISTER_BYTES); } if (!(GDB_TARGET_IS_SPARC64)) @@ -1244,7 +1244,7 @@ sparc_pop_frame (void) if (fsr[G1_REGNUM]) { read_memory (fsr[G1_REGNUM], raw_buffer, 7 * SPARC_INTREG_SIZE); - deprecated_write_register_bytes (REGISTER_BYTE (G1_REGNUM), raw_buffer, + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (G1_REGNUM), raw_buffer, 7 * SPARC_INTREG_SIZE); } @@ -1297,10 +1297,10 @@ sparc_pop_frame (void) /* Restore the out registers. Among other things this writes the new stack pointer. */ - deprecated_write_register_bytes (REGISTER_BYTE (O0_REGNUM), raw_buffer, + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (O0_REGNUM), raw_buffer, SPARC_INTREG_SIZE * 8); - deprecated_write_register_bytes (REGISTER_BYTE (L0_REGNUM), reg_temp, + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (L0_REGNUM), reg_temp, SPARC_INTREG_SIZE * 16); } @@ -1320,10 +1320,10 @@ sparc_pop_frame (void) write_register (PC_REGNUM, read_memory_integer (fsr[PC_REGNUM], REGISTER_RAW_SIZE (PC_REGNUM))); - if (fsr[NPC_REGNUM]) - write_register (NPC_REGNUM, - read_memory_integer (fsr[NPC_REGNUM], - REGISTER_RAW_SIZE (NPC_REGNUM))); + if (fsr[DEPRECATED_NPC_REGNUM]) + write_register (DEPRECATED_NPC_REGNUM, + read_memory_integer (fsr[DEPRECATED_NPC_REGNUM], + REGISTER_RAW_SIZE (DEPRECATED_NPC_REGNUM))); } else if (get_frame_extra_info (frame)->flat) { @@ -1342,7 +1342,7 @@ sparc_pop_frame (void) } write_register (PC_REGNUM, pc); - write_register (NPC_REGNUM, pc + 4); + write_register (DEPRECATED_NPC_REGNUM, pc + 4); } else if (fsr[I7_REGNUM]) { @@ -1350,7 +1350,7 @@ sparc_pop_frame (void) pc = PC_ADJUST ((CORE_ADDR) read_memory_integer (fsr[I7_REGNUM], SPARC_INTREG_SIZE)); write_register (PC_REGNUM, pc); - write_register (NPC_REGNUM, pc + 4); + write_register (DEPRECATED_NPC_REGNUM, pc + 4); } flush_cached_frames (); } @@ -1479,7 +1479,7 @@ supply_gregset (gdb_gregset_t *gregsetp) /* These require a bit more care. */ supply_register (PC_REGNUM, ((char *) (regp + R_PC)) + offset); - supply_register (NPC_REGNUM, ((char *) (regp + R_nPC)) + offset); + supply_register (DEPRECATED_NPC_REGNUM, ((char *) (regp + R_nPC)) + offset); supply_register (Y_REGNUM, ((char *) (regp + R_Y)) + offset); if (GDB_TARGET_IS_SPARC64) @@ -1598,8 +1598,8 @@ fill_gregset (gdb_gregset_t *gregsetp, int regno) if ((regno == -1) || (regno == PC_REGNUM)) deprecated_read_register_gen (PC_REGNUM, (char *) (regp + R_PC) + offset); - if ((regno == -1) || (regno == NPC_REGNUM)) - deprecated_read_register_gen (NPC_REGNUM, (char *) (regp + R_nPC) + offset); + if ((regno == -1) || (regno == DEPRECATED_NPC_REGNUM)) + deprecated_read_register_gen (DEPRECATED_NPC_REGNUM, (char *) (regp + R_nPC) + offset); if ((regno == -1) || (regno == Y_REGNUM)) deprecated_read_register_gen (Y_REGNUM, (char *) (regp + R_Y) + offset); @@ -1711,7 +1711,7 @@ fill_fpregset (gdb_fpregset_t *fpregsetp, int regno) { if ((regno == -1) || (regno == regi)) { - from = (char *) &deprecated_registers[REGISTER_BYTE (regi)]; + from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regi)]; to = (char *) &fpregsetp->pr_fr.pr_regs[regi - FP0_REGNUM]; memcpy (to, from, REGISTER_RAW_SIZE (regi)); } @@ -1720,7 +1720,7 @@ fill_fpregset (gdb_fpregset_t *fpregsetp, int regno) if (!(GDB_TARGET_IS_SPARC64)) /* FIXME: does Sparc64 have this register? */ if ((regno == -1) || (regno == FPS_REGNUM)) { - from = (char *)&deprecated_registers[REGISTER_BYTE (FPS_REGNUM)]; + from = (char *)&deprecated_registers[DEPRECATED_REGISTER_BYTE (FPS_REGNUM)]; to = (char *) &fpregsetp->pr_fsr; memcpy (to, from, REGISTER_RAW_SIZE (FPS_REGNUM)); } @@ -2416,7 +2416,7 @@ sparc_store_return_value (struct type *type, char *valbuf) deprecated_write_register_gen (regno, buffer); } else - deprecated_write_register_bytes (REGISTER_BYTE (regno), valbuf, + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (regno), valbuf, TYPE_LENGTH (type)); } @@ -2693,7 +2693,7 @@ sparc64_push_arguments (int nargs, struct value **args, CORE_ADDR sp, default: internal_error (__FILE__, __LINE__, "bad switch"); } - deprecated_write_register_bytes (REGISTER_BYTE (fpreg), + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (fpreg), VALUE_CONTENTS (args[i]), len); } @@ -2726,7 +2726,7 @@ sp64_extract_return_value (struct type *type, char *regbuf, char *valbuf, if (TYPE_CODE (type) == TYPE_CODE_FLT && SPARC_HAS_FPU) { - memcpy (valbuf, ®buf[REGISTER_BYTE (FP0_REGNUM)], typelen); + memcpy (valbuf, ®buf[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], typelen); return; } @@ -3384,7 +3384,7 @@ sparc_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_frame_args_skip (gdbarch, 68); set_gdbarch_function_start_offset (gdbarch, 0); set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); - set_gdbarch_npc_regnum (gdbarch, SPARC32_NPC_REGNUM); + set_gdbarch_deprecated_npc_regnum (gdbarch, SPARC32_NPC_REGNUM); set_gdbarch_pc_regnum (gdbarch, SPARC32_PC_REGNUM); set_gdbarch_ptr_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_deprecated_push_arguments (gdbarch, sparc32_push_arguments); @@ -3433,7 +3433,7 @@ sparc_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_frame_args_skip (gdbarch, 136); set_gdbarch_function_start_offset (gdbarch, 0); set_gdbarch_long_bit (gdbarch, 8 * TARGET_CHAR_BIT); - set_gdbarch_npc_regnum (gdbarch, SPARC64_NPC_REGNUM); + set_gdbarch_deprecated_npc_regnum (gdbarch, SPARC64_NPC_REGNUM); set_gdbarch_pc_regnum (gdbarch, SPARC64_PC_REGNUM); set_gdbarch_ptr_bit (gdbarch, 8 * TARGET_CHAR_BIT); set_gdbarch_deprecated_push_arguments (gdbarch, sparc64_push_arguments); diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c index 81b2115691a..b605a1d1862 100644 --- a/gdb/sparc64-tdep.c +++ b/gdb/sparc64-tdep.c @@ -1356,7 +1356,7 @@ sparc64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* Register numbers of various important registers. */ set_gdbarch_sp_regnum (gdbarch, SPARC_SP_REGNUM); /* %sp */ set_gdbarch_pc_regnum (gdbarch, SPARC64_PC_REGNUM); /* %pc */ - set_gdbarch_npc_regnum (gdbarch, SPARC64_NPC_REGNUM); + set_gdbarch_deprecated_npc_regnum (gdbarch, SPARC64_NPC_REGNUM); set_gdbarch_fp0_regnum (gdbarch, SPARC_F0_REGNUM); /* %f0 */ /* Call dummy code. */ diff --git a/gdb/sparcnbsd-tdep.c b/gdb/sparcnbsd-tdep.c index 6cd0e3f3a85..f2595074048 100644 --- a/gdb/sparcnbsd-tdep.c +++ b/gdb/sparcnbsd-tdep.c @@ -59,8 +59,8 @@ sparcnbsd_supply_reg32 (char *regs, int regno) if (regno == PC_REGNUM || regno == -1) supply_register (PC_REGNUM, regs + REG32_OFFSET_PC); - if (regno == NPC_REGNUM || regno == -1) - supply_register (NPC_REGNUM, regs + REG32_OFFSET_NPC); + if (regno == DEPRECATED_NPC_REGNUM || regno == -1) + supply_register (DEPRECATED_NPC_REGNUM, regs + REG32_OFFSET_NPC); if (regno == Y_REGNUM || regno == -1) supply_register (Y_REGNUM, regs + REG32_OFFSET_Y); @@ -126,8 +126,8 @@ sparcnbsd_supply_reg64 (char *regs, int regno) if (regno == PC_REGNUM || regno == -1) supply_register (PC_REGNUM, regs + REG64_OFFSET_PC); - if (regno == NPC_REGNUM || regno == -1) - supply_register (NPC_REGNUM, regs + REG64_OFFSET_NPC); + if (regno == DEPRECATED_NPC_REGNUM || regno == -1) + supply_register (DEPRECATED_NPC_REGNUM, regs + REG64_OFFSET_NPC); if (regno == Y_REGNUM || regno == -1) { @@ -220,8 +220,8 @@ sparcnbsd_fill_reg32 (char *regs, int regno) if (regno == PC_REGNUM || regno == -1) regcache_collect (PC_REGNUM, regs + REG32_OFFSET_PC); - if (regno == NPC_REGNUM || regno == -1) - regcache_collect (NPC_REGNUM, regs + REG32_OFFSET_NPC); + if (regno == DEPRECATED_NPC_REGNUM || regno == -1) + regcache_collect (DEPRECATED_NPC_REGNUM, regs + REG32_OFFSET_NPC); if (regno == Y_REGNUM || regno == -1) regcache_collect (Y_REGNUM, regs + REG32_OFFSET_Y); @@ -261,8 +261,8 @@ sparcnbsd_fill_reg64 (char *regs, int regno) if (regno == PC_REGNUM || regno == -1) regcache_collect (PC_REGNUM, regs + REG64_OFFSET_PC); - if (regno == NPC_REGNUM || regno == -1) - regcache_collect (NPC_REGNUM, regs + REG64_OFFSET_NPC); + if (regno == DEPRECATED_NPC_REGNUM || regno == -1) + regcache_collect (DEPRECATED_NPC_REGNUM, regs + REG64_OFFSET_NPC); if (regno == Y_REGNUM || regno == -1) regcache_collect (Y_REGNUM, regs + REG64_OFFSET_Y); diff --git a/gdb/stabsread.c b/gdb/stabsread.c index abfbefc6f74..93f61d58ef4 100644 --- a/gdb/stabsread.c +++ b/gdb/stabsread.c @@ -1748,17 +1748,20 @@ define_symbol (CORE_ADDR valu, char *string, int desc, int type, SYMBOL_DOMAIN (sym) = VAR_DOMAIN; if (within_function) { - /* Sun cc uses a pair of symbols, one 'p' and one 'r' with the same - name to represent an argument passed in a register. - GCC uses 'P' for the same case. So if we find such a symbol pair - we combine it into one 'P' symbol. For Sun cc we need to do this - regardless of DEPRECATED_REG_STRUCT_HAS_ADDR, because the compiler puts out - the 'p' symbol even if it never saves the argument onto the stack. - - On most machines, we want to preserve both symbols, so that - we can still get information about what is going on with the - stack (VAX for computing args_printed, using stack slots instead - of saved registers in backtraces, etc.). + /* Sun cc uses a pair of symbols, one 'p' and one 'r', with + the same name to represent an argument passed in a + register. GCC uses 'P' for the same case. So if we find + such a symbol pair we combine it into one 'P' symbol. + For Sun cc we need to do this regardless of + stabs_argument_has_addr, because the compiler puts out + the 'p' symbol even if it never saves the argument onto + the stack. + + On most machines, we want to preserve both symbols, so + that we can still get information about what is going on + with the stack (VAX for computing args_printed, using + stack slots instead of saved registers in backtraces, + etc.). Note that this code illegally combines main(argc) struct foo argc; { register struct foo argc; } @@ -1768,13 +1771,8 @@ define_symbol (CORE_ADDR valu, char *string, int desc, int type, if (local_symbols && local_symbols->nsyms > 0 #ifndef USE_REGISTER_NOT_ARG - && DEPRECATED_REG_STRUCT_HAS_ADDR_P () - && DEPRECATED_REG_STRUCT_HAS_ADDR (processing_gcc_compilation, - SYMBOL_TYPE (sym)) - && (TYPE_CODE (SYMBOL_TYPE (sym)) == TYPE_CODE_STRUCT - || TYPE_CODE (SYMBOL_TYPE (sym)) == TYPE_CODE_UNION - || TYPE_CODE (SYMBOL_TYPE (sym)) == TYPE_CODE_SET - || TYPE_CODE (SYMBOL_TYPE (sym)) == TYPE_CODE_BITSTRING) + && gdbarch_stabs_argument_has_addr (current_gdbarch, + SYMBOL_TYPE (sym)) #endif ) { @@ -2047,29 +2045,21 @@ define_symbol (CORE_ADDR valu, char *string, int desc, int type, break; } - /* When passing structures to a function, some systems sometimes pass - the address in a register, not the structure itself. */ + /* Some systems pass variables of certain types by reference instead + of by value, i.e. they will pass the address of a structure (in a + register or on the stack) instead of the structure itself. */ - if (DEPRECATED_REG_STRUCT_HAS_ADDR_P () - && DEPRECATED_REG_STRUCT_HAS_ADDR (processing_gcc_compilation, SYMBOL_TYPE (sym)) + if (gdbarch_stabs_argument_has_addr (current_gdbarch, SYMBOL_TYPE (sym)) && (SYMBOL_CLASS (sym) == LOC_REGPARM || SYMBOL_CLASS (sym) == LOC_ARG)) { - struct type *symbol_type = check_typedef (SYMBOL_TYPE (sym)); - - if ((TYPE_CODE (symbol_type) == TYPE_CODE_STRUCT) - || (TYPE_CODE (symbol_type) == TYPE_CODE_UNION) - || (TYPE_CODE (symbol_type) == TYPE_CODE_BITSTRING) - || (TYPE_CODE (symbol_type) == TYPE_CODE_SET)) - { - /* If DEPRECATED_REG_STRUCT_HAS_ADDR yields non-zero we have to convert - LOC_REGPARM to LOC_REGPARM_ADDR for structures and unions. */ - if (SYMBOL_CLASS (sym) == LOC_REGPARM) - SYMBOL_CLASS (sym) = LOC_REGPARM_ADDR; - /* Likewise for converting LOC_ARG to LOC_REF_ARG (for the 7th - and subsequent arguments on the sparc, for example). */ - else if (SYMBOL_CLASS (sym) == LOC_ARG) - SYMBOL_CLASS (sym) = LOC_REF_ARG; - } + /* We have to convert LOC_REGPARM to LOC_REGPARM_ADDR (for + variables passed in a register). */ + if (SYMBOL_CLASS (sym) == LOC_REGPARM) + SYMBOL_CLASS (sym) = LOC_REGPARM_ADDR; + /* Likewise for converting LOC_ARG to LOC_REF_ARG (for the 7th + and subsequent arguments on SPARC, for example). */ + else if (SYMBOL_CLASS (sym) == LOC_ARG) + SYMBOL_CLASS (sym) = LOC_REF_ARG; } /* Is there more to parse? For example LRS/alias information? */ diff --git a/gdb/sun3-nat.c b/gdb/sun3-nat.c index 1df78589bdb..6c52d3388c2 100644 --- a/gdb/sun3-nat.c +++ b/gdb/sun3-nat.c @@ -47,13 +47,13 @@ fetch_inferior_registers (int regno) memcpy (deprecated_registers, &inferior_registers, 16 * 4); if (FP0_REGNUM >= 0) - memcpy (&deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], &inferior_fp_registers, sizeof inferior_fp_registers.fps_regs); - *(int *) &deprecated_registers[REGISTER_BYTE (PS_REGNUM)] = inferior_registers.r_ps; - *(int *) &deprecated_registers[REGISTER_BYTE (PC_REGNUM)] = inferior_registers.r_pc; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)] = inferior_registers.r_ps; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)] = inferior_registers.r_pc; if (FP0_REGNUM >= 0) - memcpy (&deprecated_registers[REGISTER_BYTE (FPC_REGNUM)], + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FPC_REGNUM)], &inferior_fp_registers.fps_control, sizeof inferior_fp_registers - sizeof inferior_fp_registers.fps_regs); @@ -72,15 +72,15 @@ store_inferior_registers (int regno) memcpy (&inferior_registers, deprecated_registers, 16 * 4); if (FP0_REGNUM >= 0) memcpy (&inferior_fp_registers, - &deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], sizeof inferior_fp_registers.fps_regs); - inferior_registers.r_ps = *(int *) &&deprecated_registers[REGISTER_BYTE (PS_REGNUM)]; - inferior_registers.r_pc = *(int *) &&deprecated_registers[REGISTER_BYTE (PC_REGNUM)]; + inferior_registers.r_ps = *(int *) &&deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)]; + inferior_registers.r_pc = *(int *) &&deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)]; if (FP0_REGNUM >= 0) memcpy (&inferior_fp_registers.fps_control, - &&deprecated_registers[REGISTER_BYTE (FPC_REGNUM)], + &&deprecated_registers[DEPRECATED_REGISTER_BYTE (FPC_REGNUM)], sizeof inferior_fp_registers - sizeof inferior_fp_registers.fps_regs); @@ -131,10 +131,10 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, { if (FP0_REGNUM >= 0) { - memcpy (&&deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + memcpy (&&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], fpustruct->f_fpstatus.fps_regs, sizeof fpustruct->f_fpstatus.fps_regs); - memcpy (&&deprecated_registers[REGISTER_BYTE (FPC_REGNUM)], + memcpy (&&deprecated_registers[DEPRECATED_REGISTER_BYTE (FPC_REGNUM)], &fpustruct->f_fpstatus.fps_control, sizeof fpustruct->f_fpstatus - sizeof fpustruct->f_fpstatus.fps_regs); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index a81f45215e5..347f146a58c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2003-09-17 Michael Chastain <mec@shout.net> + + * gdb.cp/gdb1355.exp: New file. + * gdb.cp/gdb1355.c: New file. + 2003-09-15 Corinna Vinschen <vinschen@redhat.com> * gdb.asm/asm-source.exp: Add sh*-*-* as supported target. @@ -5,8 +10,8 @@ 2003-09-11 David Carlton <carlton@kealia.com> - * gdb.c++/namespace.exp: Add tests for namespace types. - * gdb.c++/maint.exp (test_help): Test 'help maint cp namespace'. + * gdb.cp/namespace.exp: Add tests for namespace types. + * gdb.cp/maint.exp (test_help): Test 'help maint cp namespace'. (test_namespace): New. 2003-09-11 Elena Zannoni <ezannoni@redhat.com> diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c index 8b5070c1acd..2b239b62741 100644 --- a/gdb/v850-tdep.c +++ b/gdb/v850-tdep.c @@ -1065,7 +1065,7 @@ v850_extract_return_value (struct type *type, char *regbuf, char *valbuf) /* Scalar return values of <= 8 bytes are returned in E_V0_REGNUM to E_V1_REGNUM. */ memcpy (valbuf, - ®buf[REGISTER_BYTE (E_V0_REGNUM)], + ®buf[DEPRECATED_REGISTER_BYTE (E_V0_REGNUM)], TYPE_LENGTH (type)); } else @@ -1073,7 +1073,7 @@ v850_extract_return_value (struct type *type, char *regbuf, char *valbuf) /* Aggregates and return values > 8 bytes are returned in memory, pointed to by R6. */ return_buffer = - extract_unsigned_integer (regbuf + REGISTER_BYTE (E_V0_REGNUM), + extract_unsigned_integer (regbuf + DEPRECATED_REGISTER_BYTE (E_V0_REGNUM), REGISTER_RAW_SIZE (E_V0_REGNUM)); read_memory (return_buffer, valbuf, TYPE_LENGTH (type)); @@ -1101,7 +1101,7 @@ v850_store_return_value (struct type *type, char *valbuf) CORE_ADDR return_buffer; if (!v850_use_struct_convention (0, type)) - deprecated_write_register_bytes (REGISTER_BYTE (E_V0_REGNUM), valbuf, + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (E_V0_REGNUM), valbuf, TYPE_LENGTH (type)); else { diff --git a/gdb/v850ice.c b/gdb/v850ice.c index 770e942a8d1..bb1385a6325 100644 --- a/gdb/v850ice.c +++ b/gdb/v850ice.c @@ -560,7 +560,7 @@ v850ice_store_registers (int regno) return; } - regval = extract_unsigned_integer (&deprecated_registers[REGISTER_BYTE (regno)], + regval = extract_unsigned_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)], REGISTER_RAW_SIZE (regno)); strcpy (cmd, "reg "); if (!convert_register (regno, &cmd[4])) diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c index 76fd5b77480..2bbe42199e0 100644 --- a/gdb/vax-tdep.c +++ b/gdb/vax-tdep.c @@ -267,7 +267,7 @@ vax_store_struct_return (CORE_ADDR addr, CORE_ADDR sp) static void vax_extract_return_value (struct type *valtype, char *regbuf, char *valbuf) { - memcpy (valbuf, regbuf + REGISTER_BYTE (0), TYPE_LENGTH (valtype)); + memcpy (valbuf, regbuf + DEPRECATED_REGISTER_BYTE (0), TYPE_LENGTH (valtype)); } static void @@ -279,7 +279,7 @@ vax_store_return_value (struct type *valtype, char *valbuf) static CORE_ADDR vax_extract_struct_value_address (char *regbuf) { - return (extract_unsigned_integer (regbuf + REGISTER_BYTE (0), + return (extract_unsigned_integer (regbuf + DEPRECATED_REGISTER_BYTE (0), REGISTER_RAW_SIZE (0))); } diff --git a/gdb/version.in b/gdb/version.in index 85fb2f633a5..4d1b14bd318 100644 --- a/gdb/version.in +++ b/gdb/version.in @@ -1 +1 @@ -2003-09-16-cvs +2003-09-18-cvs diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c index 2e9585249cc..1e8629492b4 100644 --- a/gdb/xstormy16-tdep.c +++ b/gdb/xstormy16-tdep.c @@ -221,7 +221,7 @@ xstormy16_extract_return_value (struct type *type, char *regbuf, char *valbuf) /* Scalar return values of <= 12 bytes are returned in E_1ST_ARG_REGNUM to E_LST_ARG_REGNUM. */ memcpy (valbuf, - ®buf[REGISTER_BYTE (E_1ST_ARG_REGNUM)] + offset, + ®buf[DEPRECATED_REGISTER_BYTE (E_1ST_ARG_REGNUM)] + offset, TYPE_LENGTH (type)); } else @@ -229,7 +229,7 @@ xstormy16_extract_return_value (struct type *type, char *regbuf, char *valbuf) /* Aggregates and return values > 12 bytes are returned in memory, pointed to by R2. */ return_buffer = - extract_unsigned_integer (regbuf + REGISTER_BYTE (E_PTR_RET_REGNUM), + extract_unsigned_integer (regbuf + DEPRECATED_REGISTER_BYTE (E_PTR_RET_REGNUM), REGISTER_RAW_SIZE (E_PTR_RET_REGNUM)); read_memory (return_buffer, valbuf, TYPE_LENGTH (type)); @@ -393,7 +393,7 @@ xstormy16_store_return_value (struct type *type, char *valbuf) } else if (xstormy16_type_is_scalar (type) && TYPE_LENGTH (type) <= E_MAX_RETTYPE_SIZE_IN_REGS) - deprecated_write_register_bytes (REGISTER_BYTE (E_1ST_ARG_REGNUM), + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (E_1ST_ARG_REGNUM), valbuf, TYPE_LENGTH (type)); else { |