* Add support for ppc-lynxos to GDBserver
@ 2010-06-23 17:46 Joel Brobecker
2010-06-23 17:46 ` [RFA 2/3] Import vsnprintf from libiberty if not available Joel Brobecker
` (2 more replies)
0 siblings, 3 replies; 13+ messages in thread
From: Joel Brobecker @ 2010-06-23 17:46 UTC (permalink / raw)
To: gdb-patches
Hello,
As discussed on IRC, I am submitting these series of patches that
brings support for powerpc-lynxos to GDBserver. As mentioned in
the last patch, this is single-process all-stop support only.
This entire patch series was tested as a whole using a ppc-lynxos cross
GDB hosted on sparc-solaris 2.8. I ran AdaCore's testsuite, which is
capable of running testcases with gdbserver running on a different
machine than then host.
--
Joel
^ permalink raw reply [flat|nested] 13+ messages in thread* [RFA 2/3] Import vsnprintf from libiberty if not available. 2010-06-23 17:46 Add support for ppc-lynxos to GDBserver Joel Brobecker @ 2010-06-23 17:46 ` Joel Brobecker 2010-06-23 19:19 ` Joseph S. Myers 2010-06-24 12:08 ` Pierre Muller 2010-06-23 17:46 ` [RFA 1/3] Generate regformats/rs6000/powerpc-32.dat Joel Brobecker 2010-06-23 17:46 ` [RFA 3/3] gdbserver support for powerpc-lynxos (4.x) Joel Brobecker 2 siblings, 2 replies; 13+ messages in thread From: Joel Brobecker @ 2010-06-23 17:46 UTC (permalink / raw) To: gdb-patches; +Cc: Joel Brobecker vasprintf and vsnprintf are not available on LynxOS, at least not on version 4.0.0. This patch updates the configury to import them from libiberty if not available out of the box. The long-term goal in this area is to start using gnulib instead of libiberty, so I will look at that in the short future. But in the meantime, this is a reasonably uninvasive patch that allowed me to get the missing functions in no time. gdbserver/ * Makefile.in (vasprintf.o, vsnprintf.o): New rules. * configure.ac: Add check for vasprintf and vsnprintf. * configure, config.in: Regenerate. * server.h (vasprintf, vsnprintf): Add conditional declarations. -- Joel --- gdb/gdbserver/Makefile.in | 5 +++++ gdb/gdbserver/config.in | 14 ++++++++++++++ gdb/gdbserver/configure | 44 ++++++++++++++++++++++++++++++++++++-------- gdb/gdbserver/configure.ac | 4 ++-- gdb/gdbserver/server.h | 7 +++++++ 5 files changed, 64 insertions(+), 10 deletions(-) diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 7c75aed..c2e3ea2 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -340,6 +340,11 @@ signals.o: ../common/signals.c $(server_h) memmem.o: ../gnulib/memmem.c $(CC) -o memmem.o -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< +vasprintf.o: $(srcdir)/../../libiberty/vasprintf.c + $(CC) -o vasprintf.o -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< +vsnprintf.o: $(srcdir)/../../libiberty/vsnprintf.c + $(CC) -o vsnprintf.o -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< + i386_low_h = $(srcdir)/i386-low.h i386-low.o: i386-low.c $(i386_low_h) $(server_h) $(target_h) diff --git a/gdb/gdbserver/config.in b/gdb/gdbserver/config.in index 1054966..8f446a4 100644 --- a/gdb/gdbserver/config.in +++ b/gdb/gdbserver/config.in @@ -15,6 +15,14 @@ don't. */ #undef HAVE_DECL_STRERROR +/* Define to 1 if you have the declaration of `vasprintf', and to 0 if you + don't. */ +#undef HAVE_DECL_VASPRINTF + +/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you + don't. */ +#undef HAVE_DECL_VSNPRINTF + /* Define to 1 if you have the `dladdr' function. */ #undef HAVE_DLADDR @@ -154,6 +162,12 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the `vasprintf' function. */ +#undef HAVE_VASPRINTF + +/* Define to 1 if you have the `vsnprintf' function. */ +#undef HAVE_VSNPRINTF + /* Checking if errno must be defined */ #undef MUST_DEFINE_ERRNO diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index c48e7a3..2708f23 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -1747,8 +1747,10 @@ $as_echo "$ac_res" >&6; } ac_fn_c_check_decl () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 -$as_echo_n "checking whether $2 is declared... " >&6; } + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else @@ -1758,8 +1760,12 @@ $4 int main () { -#ifndef $2 - (void) $2; +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif #endif ; @@ -3798,12 +3804,14 @@ _ACEOF fi done -for ac_func in memmem +for ac_func in memmem vasprintf vsnprintf do : - ac_fn_c_check_func "$LINENO" "memmem" "ac_cv_func_memmem" -if test "x$ac_cv_func_memmem" = x""yes; then : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_MEMMEM 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF else @@ -3918,6 +3926,26 @@ fi cat >>confdefs.h <<_ACEOF #define HAVE_DECL_MEMMEM $ac_have_decl _ACEOF +ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "$ac_includes_default" +if test "x$ac_cv_have_decl_vasprintf" = x""yes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_VASPRINTF $ac_have_decl +_ACEOF +ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default" +if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_VSNPRINTF $ac_have_decl +_ACEOF ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "#include <sys/types.h> diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac index 729a77a..40d30c4 100644 --- a/gdb/gdbserver/configure.ac +++ b/gdb/gdbserver/configure.ac @@ -43,7 +43,7 @@ AC_CHECK_HEADERS(sgtty.h termio.h termios.h sys/reg.h string.h dnl sys/ioctl.h netinet/in.h sys/socket.h netdb.h dnl netinet/tcp.h arpa/inet.h sys/wait.h) AC_CHECK_FUNCS(pread pwrite pread64) -AC_REPLACE_FUNCS(memmem) +AC_REPLACE_FUNCS(memmem vasprintf vsnprintf) dnl dladdr is glibc-specific. It is used by thread-db.c but only for dnl debugging messages. It lives in -ldl which is handled below so we don't @@ -70,7 +70,7 @@ AC_TRY_LINK([ [AC_MSG_RESULT(no)]) fi -AC_CHECK_DECLS([strerror, perror, memmem]) +AC_CHECK_DECLS([strerror, perror, memmem, vasprintf, vsnprintf]) AC_CHECK_TYPES(socklen_t, [], [], [#include <sys/types.h> diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index 8bdd217..f853fb7 100644 --- a/gdb/gdbserver/server.h +++ b/gdb/gdbserver/server.h @@ -54,6 +54,13 @@ extern void perror (const char *); extern void *memmem (const void *, size_t , const void *, size_t); #endif +#ifndef HAVE_DECL_VASPRINTF +extern int vasprintf(char **strp, const char *fmt, va_list ap); +#endif +#ifndef HAVE_DECL_VSNPRINTF +int vsnprintf(char *str, size_t size, const char *format, va_list ap); +#endif + #ifndef ATTR_NORETURN #if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)) #define ATTR_NORETURN __attribute__ ((noreturn)) -- 1.7.0.4 ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [RFA 2/3] Import vsnprintf from libiberty if not available. 2010-06-23 17:46 ` [RFA 2/3] Import vsnprintf from libiberty if not available Joel Brobecker @ 2010-06-23 19:19 ` Joseph S. Myers 2010-06-24 12:08 ` Pierre Muller 1 sibling, 0 replies; 13+ messages in thread From: Joseph S. Myers @ 2010-06-23 19:19 UTC (permalink / raw) To: Joel Brobecker; +Cc: gdb-patches On Wed, 23 Jun 2010, Joel Brobecker wrote: > The long-term goal in this area is to start using gnulib instead of > libiberty, so I will look at that in the short future. But in the As a general principle, gnulib and libiberty serve similar purposes and I don't believe the GNU Project needs two different libraries in this area (furthermore, both gnulib and libiberty import many files from glibc, though libiberty often has accumulated many local changes to these files). In practice I expect it would be a lot of work to convert libiberty-using software to gnulib, or to make libiberty import most of its files unchanged from gnulib and so be more of a wrapper around gnulib, and the benefits would be limited - but certainly it seems a good idea for more self-contained software such as gdbserver. -- Joseph S. Myers joseph@codesourcery.com ^ permalink raw reply [flat|nested] 13+ messages in thread
* RE: [RFA 2/3] Import vsnprintf from libiberty if not available. 2010-06-23 17:46 ` [RFA 2/3] Import vsnprintf from libiberty if not available Joel Brobecker 2010-06-23 19:19 ` Joseph S. Myers @ 2010-06-24 12:08 ` Pierre Muller 2010-06-24 12:40 ` Pierre Muller 1 sibling, 1 reply; 13+ messages in thread From: Pierre Muller @ 2010-06-24 12:08 UTC (permalink / raw) To: 'Joel Brobecker', gdb-patches Hi Joel, I am probably missing a part of your patch... I do not understand what triggers the compilation of the vasprint.o and vsnprintf.o objects are added to the list of required objects to compile and link for the final gdbserver executable. I also saw not explicit reference to these objects in the third part of your patch. Is this inclusion hidden somewhere in your configure changes? Pierre Muller Pascal language support maintainer for GDB ^ permalink raw reply [flat|nested] 13+ messages in thread
* RE: [RFA 2/3] Import vsnprintf from libiberty if not available. 2010-06-24 12:08 ` Pierre Muller @ 2010-06-24 12:40 ` Pierre Muller 0 siblings, 0 replies; 13+ messages in thread From: Pierre Muller @ 2010-06-24 12:40 UTC (permalink / raw) To: 'Joel Brobecker', gdb-patches Nevermind, I finally found the answer myself, by looking more deeply into gdbserver/configure The inclusion already works for memmem.o by adding memmem.o to LIBOBJS around line 3812 but that part did not need any change (as it use already $ac_func) where the lines just before were changed by your patch because they used MEMMEM/memmem explicitly instead of $ac_xxx variables. As LIBOBJS didn't appear at all in your patch, I had a hard time find out how the objects are added to the needed list! Pierre > -----Message d'origine----- > De : gdb-patches-owner@sourceware.org [mailto:gdb-patches- > owner@sourceware.org] De la part de Pierre Muller > Envoyé : Thursday, June 24, 2010 2:08 PM > À : 'Joel Brobecker'; gdb-patches@sourceware.org > Objet : RE: [RFA 2/3] Import vsnprintf from libiberty if not available. > > Hi Joel, > > > I am probably missing a part of your patch... > > I do not understand what triggers the compilation of the > vasprint.o and vsnprintf.o objects are added to the list > of required objects to compile and link for the final > gdbserver executable. > > I also saw not explicit reference to these objects > in the third part of your patch. > > Is this inclusion hidden somewhere in your configure changes? > > > Pierre Muller > Pascal language support maintainer for GDB > > ^ permalink raw reply [flat|nested] 13+ messages in thread
* [RFA 1/3] Generate regformats/rs6000/powerpc-32.dat 2010-06-23 17:46 Add support for ppc-lynxos to GDBserver Joel Brobecker 2010-06-23 17:46 ` [RFA 2/3] Import vsnprintf from libiberty if not available Joel Brobecker @ 2010-06-23 17:46 ` Joel Brobecker 2010-06-23 17:46 ` [RFA 3/3] gdbserver support for powerpc-lynxos (4.x) Joel Brobecker 2 siblings, 0 replies; 13+ messages in thread From: Joel Brobecker @ 2010-06-23 17:46 UTC (permalink / raw) To: gdb-patches; +Cc: Joel Brobecker I will need this description for the ppc-lynxos debugger where, AFAICT, we only have access to the core GP and FP registers. So this adds powerpc-32 to the list of targets for which a .dat file needs to be generated. 2010-04-30 Joel Brobecker <brobecker@adacore.com> * features/Makefile (WHICH): Add rs6000/powerpc-32. (powerpc-32.o, powerpc-32.c): New rules. (clean): Also remove powerpc-32.c. * regformats/rs6000/powerpc-32.dat: Generate. -- Joel --- gdb/features/Makefile | 1 + gdb/gdbserver/Makefile.in | 5 ++- gdb/regformats/rs6000/powerpc-32.dat | 75 ++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 1 deletions(-) create mode 100644 gdb/regformats/rs6000/powerpc-32.dat diff --git a/gdb/features/Makefile b/gdb/features/Makefile index 987854b..13e0ea6 100644 --- a/gdb/features/Makefile +++ b/gdb/features/Makefile @@ -37,6 +37,7 @@ WHICH = arm-with-iwmmxt arm-with-vfpv2 arm-with-vfpv3 arm-with-neon \ i386/i386-avx i386/i386-avx-linux \ i386/amd64-avx i386/amd64-avx-linux \ mips-linux mips64-linux \ + rs6000/powerpc-32 \ rs6000/powerpc-32l rs6000/powerpc-altivec32l rs6000/powerpc-e500l \ rs6000/powerpc-64l rs6000/powerpc-altivec64l rs6000/powerpc-vsx32l \ rs6000/powerpc-vsx64l rs6000/powerpc-cell32l rs6000/powerpc-cell64l \ diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 2267c58..7c75aed 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -228,7 +228,7 @@ clean: rm -f arm-with-iwmmxt.c rm -f arm-with-vfpv2.c arm-with-vfpv3.c arm-with-neon.c rm -f mips-linux.c mips64-linux.c - rm -f powerpc-32l.c powerpc-64l.c powerpc-e500l.c + rm -f powerpc-32.c powerpc-32l.c powerpc-64l.c powerpc-e500l.c rm -f powerpc-altivec32l.c powerpc-cell32l.c powerpc-vsx32l.c rm -f powerpc-altivec64l.c powerpc-cell64l.c powerpc-vsx64l.c rm -f powerpc-isa205-32l.c powerpc-isa205-64l.c @@ -433,6 +433,9 @@ mips-linux.c : $(srcdir)/../regformats/mips-linux.dat $(regdat_sh) mips64-linux.o : mips64-linux.c $(regdef_h) mips64-linux.c : $(srcdir)/../regformats/mips64-linux.dat $(regdat_sh) $(SHELL) $(regdat_sh) $(srcdir)/../regformats/mips64-linux.dat mips64-linux.c +powerpc-32.o : powerpc-32.c $(regdef_h) +powerpc-32.c : $(srcdir)/../regformats/rs6000/powerpc-32.dat $(regdat_sh) + $(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-32.dat powerpc-32.c powerpc-32l.o : powerpc-32l.c $(regdef_h) powerpc-32l.c : $(srcdir)/../regformats/rs6000/powerpc-32l.dat $(regdat_sh) $(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-32l.dat powerpc-32l.c diff --git a/gdb/regformats/rs6000/powerpc-32.dat b/gdb/regformats/rs6000/powerpc-32.dat new file mode 100644 index 0000000..e4e9392 --- /dev/null +++ b/gdb/regformats/rs6000/powerpc-32.dat @@ -0,0 +1,75 @@ +# DO NOT EDIT: generated from rs6000/powerpc-32.xml +name:powerpc_32 +xmltarget:powerpc-32.xml +expedite:r1,pc +32:r0 +32:r1 +32:r2 +32:r3 +32:r4 +32:r5 +32:r6 +32:r7 +32:r8 +32:r9 +32:r10 +32:r11 +32:r12 +32:r13 +32:r14 +32:r15 +32:r16 +32:r17 +32:r18 +32:r19 +32:r20 +32:r21 +32:r22 +32:r23 +32:r24 +32:r25 +32:r26 +32:r27 +32:r28 +32:r29 +32:r30 +32:r31 +64:f0 +64:f1 +64:f2 +64:f3 +64:f4 +64:f5 +64:f6 +64:f7 +64:f8 +64:f9 +64:f10 +64:f11 +64:f12 +64:f13 +64:f14 +64:f15 +64:f16 +64:f17 +64:f18 +64:f19 +64:f20 +64:f21 +64:f22 +64:f23 +64:f24 +64:f25 +64:f26 +64:f27 +64:f28 +64:f29 +64:f30 +64:f31 +32:pc +32:msr +32:cr +32:lr +32:ctr +32:xer +32:fpscr -- 1.7.0.4 ^ permalink raw reply [flat|nested] 13+ messages in thread
* [RFA 3/3] gdbserver support for powerpc-lynxos (4.x) 2010-06-23 17:46 Add support for ppc-lynxos to GDBserver Joel Brobecker 2010-06-23 17:46 ` [RFA 2/3] Import vsnprintf from libiberty if not available Joel Brobecker 2010-06-23 17:46 ` [RFA 1/3] Generate regformats/rs6000/powerpc-32.dat Joel Brobecker @ 2010-06-23 17:46 ` Joel Brobecker 2010-07-27 16:13 ` Pedro Alves 2 siblings, 1 reply; 13+ messages in thread From: Joel Brobecker @ 2010-06-23 17:46 UTC (permalink / raw) To: gdb-patches; +Cc: Joel Brobecker This patch adds support for powerpc-lynxos. Note that I'm adding a new varialble "srv_extra_libs" in configure.srv. I need this because I need to link against -linet. Perhaps the right way of doing things might have been to use a configure check... gdbserver/ChangeLog: * gdbserver/lynx-debug.c, gdbserver/lynx-debug.h, gdbserver/lynx-low.c, gdbserver/lynx-low.h, gdbserver/lynx-ppc-low.c, gdbserver/lynx-ptrace.c, gdbserver/lynx-ptrace.h: New files. * Makefile.in (lynx_debug_h, lynx_ptrace_h, lynx_low_h): New variables. (lynx-debug.o, lynx-low.o, lynx-ppc-low.o, lynx-ptrace.o): New rules. * configure.ac: Add support for srv_extra_libs variable. * configure.srv: Add handling of powerpc-*-lynxos* targets. * configure: regenerate. -- Joel --- gdb/gdbserver/Makefile.in | 9 + gdb/gdbserver/configure | 4 + gdb/gdbserver/configure.ac | 4 + gdb/gdbserver/configure.srv | 4 + gdb/gdbserver/lynx-debug.c | 35 +++ gdb/gdbserver/lynx-debug.h | 26 ++ gdb/gdbserver/lynx-low.c | 531 ++++++++++++++++++++++++++++++++++++++++++ gdb/gdbserver/lynx-low.h | 57 +++++ gdb/gdbserver/lynx-ppc-low.c | 186 +++++++++++++++ gdb/gdbserver/lynx-ptrace.c | 262 +++++++++++++++++++++ gdb/gdbserver/lynx-ptrace.h | 26 ++ 11 files changed, 1144 insertions(+), 0 deletions(-) create mode 100644 gdb/gdbserver/lynx-debug.c create mode 100644 gdb/gdbserver/lynx-debug.h create mode 100644 gdb/gdbserver/lynx-low.c create mode 100644 gdb/gdbserver/lynx-low.h create mode 100644 gdb/gdbserver/lynx-ppc-low.c create mode 100644 gdb/gdbserver/lynx-ptrace.c create mode 100644 gdb/gdbserver/lynx-ptrace.h diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index c2e3ea2..7f6649d 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -293,6 +293,10 @@ server_h = $(srcdir)/server.h $(regcache_h) config.h $(srcdir)/target.h \ linux_low_h = $(srcdir)/linux-low.h +lynx_debug_h = $(srcdir)/lynx-debug.h $(srcdir)/server.h +lynx_ptrace_h = $(srcdir)/lynx-ptrace.h $(srcdir)/server.h +lynx_low_h = $(srcdir)/lynx-low.h $(srcdir)/server.h + nto_low_h = $(srcdir)/nto-low.h # Note, we only build the IPA if -fvisibility=hidden is supported in @@ -369,6 +373,11 @@ linux-x86-low.o: linux-x86-low.c $(linux_low_h) $(server_h) \ $(gdb_proc_service_h) $(i386_low_h) linux-xtensa-low.o: linux-xtensa-low.c xtensa-xtregs.c $(linux_low_h) $(server_h) +lynx-debug.o: lynx-debug.c $(lynx_debug_h) +lynx-low.o: lynx-low.c $(server_h) $(target_h) $(lynx_low_h) $(lynx_debug_h) \ + $(lynx_ptrace_h) +lynx-ppc-low.o: lynx-ppc-low.c $(server_h) $(lynx_low_h) +lynx-ptrace.o: lynx-ptrace.c $(server_h) $(lynx_ptrace_h) nto-low.o: nto-low.c $(server_h) $(nto_low_h) nto-x86-low.o: nto-x86-low.c $(server_h) $(nto_low_h) $(regdef_h) $(regcache_h) diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index 2708f23..0521214 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -4563,6 +4563,10 @@ if test "$ipa_obj" != "" \ extra_libraries="libinproctrace.so" fi +if test "$srv_extra_libs" != ""; then + GDBSERVER_LIBS="$GDBSERVER_LIBS $srv_extra_libs" +fi + diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac index 40d30c4..6d810fa 100644 --- a/gdb/gdbserver/configure.ac +++ b/gdb/gdbserver/configure.ac @@ -275,6 +275,10 @@ if test "$ipa_obj" != "" \ extra_libraries="libinproctrace.so" fi +if test "$srv_extra_libs" != ""; then + GDBSERVER_LIBS="$GDBSERVER_LIBS $srv_extra_libs" +fi + AC_SUBST(GDBSERVER_DEPFILES) AC_SUBST(GDBSERVER_LIBS) AC_SUBST(USE_THREAD_DB) diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv index 99187a5..e1bb84a 100644 --- a/gdb/gdbserver/configure.srv +++ b/gdb/gdbserver/configure.srv @@ -200,6 +200,10 @@ case "${target}" in srv_linux_regsets=yes srv_linux_thread_db=yes ;; + powerpc-*-lynxos*) srv_regobj="powerpc-32.o" + srv_tgtobj="lynx-low.o lynx-ppc-low.o lynx-debug.o lynx-ptrace.o" + srv_extra_libs="-lnetinet" + ;; s390*-*-linux*) srv_regobj="s390-linux32.o" srv_regobj="${srv_regobj} s390-linux64.o" srv_regobj="${srv_regobj} s390x-linux64.o" diff --git a/gdb/gdbserver/lynx-debug.c b/gdb/gdbserver/lynx-debug.c new file mode 100644 index 0000000..aaca754 --- /dev/null +++ b/gdb/gdbserver/lynx-debug.c @@ -0,0 +1,35 @@ +/* Copyright (C) 2010 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include "lynx-debug.h" + +void +lynx_debug (char *string, ...) +{ + va_list args; + + if (!debug_threads) + return; + + va_start (args, string); + fprintf (stdout, "DEBUG(lynx): "); + vfprintf (stdout, string, args); + fprintf (stdout, "\n"); + va_end (args); +} + + diff --git a/gdb/gdbserver/lynx-debug.h b/gdb/gdbserver/lynx-debug.h new file mode 100644 index 0000000..396df2b --- /dev/null +++ b/gdb/gdbserver/lynx-debug.h @@ -0,0 +1,26 @@ +/* Copyright (C) 2010 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#ifndef LYNX_DEBUG_H +#define LYNX_DEBUG_H + +#include "server.h" + +/* Print a debug trace on standard output if debug_threads is set. */ +extern void lynx_debug (char *string, ...) ATTR_FORMAT (printf, 1, 2); + +#endif diff --git a/gdb/gdbserver/lynx-low.c b/gdb/gdbserver/lynx-low.c new file mode 100644 index 0000000..50cc26a --- /dev/null +++ b/gdb/gdbserver/lynx-low.c @@ -0,0 +1,531 @@ +/* Copyright (C) 2009, 2010 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include "server.h" +#include "target.h" +#include "lynx-low.h" +#include "lynx-debug.h" +#include "lynx-ptrace.h" + +#include <limits.h> +#include <ptrace.h> +#include <sys/piddef.h> /* Provides PIDGET, TIDGET, BUILDPID, etc. */ +#include <unistd.h> +#include <sys/ioctl.h> +#include <sys/types.h> +#include <sys/wait.h> +#include <signal.h> + +int using_threads = 1; + +/* Build a ptid_t given a PID and a LynxOS TID. */ + +ptid_t +lynx_ptid_build (int pid, long tid) +{ + /* brobecker/2010-06-21: It looks like the LWP field in ptids + should be distinct for each thread (see write_ptid where it + writes the thread ID from the LWP). So instead of storing + the LynxOS tid in the tid field of the ptid, we store it in + the lwp field. */ + return ptid_build (pid, tid, 0); +} + +/* Return the process ID of the given PTID. + + This function has little reason to exist, it's just a wrapper around + ptid_get_pid. But since we have a getter function for the lynxos + ptid, it feels cleaner to have a getter for the pid as well. */ + +int +lynx_ptid_get_pid (ptid_t ptid) +{ + return ptid_get_pid (ptid); +} + +/* Return the LynxOS tid of the given PTID. */ + +long +lynx_ptid_get_tid (ptid_t ptid) +{ + /* See lynx_ptid_build: The LynxOS tid is stored inside the lwp field + of the ptid. */ + return ptid_get_lwp (ptid); +} + +/* Implement the create_inferior method of the target_ops vector. */ + +static int +lynx_create_inferior (char *program, char **allargs) +{ + void *new_process; + int pid; + + lynx_debug ("lynx_create_inferior ()"); + + pid = fork (); + if (pid < 0) + perror_with_name ("fork"); + + if (pid == 0) + { + int pgrp; + + /* Switch child to its own process group so that signals won't + directly affect gdbserver. */ + pgrp = getpid(); + setpgid (0, pgrp); + ioctl (0, TIOCSPGRP, &pgrp); + lynx_ptrace (PTRACE_TRACEME, null_ptid, 0, 0, 0); + execv (program, allargs); + fprintf (stderr, "Cannot exec %s: %s.\n", program, strerror (errno)); + fflush (stderr); + _exit (0177); + } + + new_process = add_process (pid, 0); + /* Do not add the process thread just yet, as we do not know its tid. + We will add it later, during the wait for the STOP event corresponding + to the lynx_ptrace (PTRACE_TRACEME) call above. */ + return pid; +} + +/* Implement the attach target_ops method. */ + +static int +lynx_attach (unsigned long pid) +{ + struct process_info *new_process; + ptid_t ptid = lynx_ptid_build (pid, 0); + + if (lynx_ptrace (PTRACE_ATTACH, ptid, 0, 0, 0) != 0) + error ("Cannot attach to process %lu: %s (%d)\n", pid, + strerror (errno), errno); + + new_process = (struct process_info *) add_process (pid, 1); + add_thread (ptid, NULL); + + return 0; +} + +/* Implement the resume target_ops method. */ + +static void +lynx_resume (struct thread_resume *resume_info, size_t n) +{ + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); + /* FIXME: Assume for now that n == 1. */ + const int request = (resume_info[0].kind == resume_step + ? PTRACE_SINGLESTEP : PTRACE_CONT); + const int signal = resume_info[0].sig; + int ret; + + regcache_invalidate (); + ret = lynx_ptrace (request, inferior_ptid, 1, signal, 0); +} + +/* Resume the execution of the given PTID. */ + +static void +lynx_continue (ptid_t ptid) +{ + struct thread_resume resume_info; + + resume_info.thread = ptid; + resume_info.kind = resume_continue; + resume_info.sig = 0; + + lynx_resume (&resume_info, 1); +} + +/* Remove all inferiors and associated threads. */ + +static void +lynx_clear_inferiors (void) +{ + /* We do not use private data, so nothing much to do except calling + clear_inferiors. */ + clear_inferiors (); +} + +/* A wrapper around waitpid that handles the various idiosyncrasies + of LynxOS' waitpid. */ + +static int +lynx_waitpid (int pid, int *stat_loc) +{ + int ret = 0; + + while (1) + { + ret = waitpid (pid, stat_loc, WNOHANG); + if (ret < 0) + { + /* An ECHILD error is not indicative of a real problem. + It happens for instance while waiting for the inferior + to stop after attaching to it. */ + if (errno != ECHILD) + perror_with_name ("waitpid (WNOHANG)"); + } + if (ret > 0) + break; + /* No event with WNOHANG. See if there is one with WUNTRACED. */ + ret = waitpid (pid, stat_loc, WNOHANG | WUNTRACED); + if (ret < 0) + { + /* An ECHILD error is not indicative of a real problem. + It happens for instance while waiting for the inferior + to stop after attaching to it. */ + if (errno != ECHILD) + perror_with_name ("waitpid (WNOHANG|WUNTRACED)"); + } + if (ret > 0) + break; + usleep (1000); + } + return ret; +} + +/* Implement the wait target_ops method. */ + +static ptid_t +lynx_wait_1 (ptid_t ptid, struct target_waitstatus *status, int options) +{ + int pid; + int ret; + int wstat; + ptid_t new_ptid; + + if (ptid_equal (ptid, minus_one_ptid)) + pid = lynx_ptid_get_pid (thread_to_gdb_id (current_inferior)); + else + pid = BUILDPID (lynx_ptid_get_pid (ptid), lynx_ptid_get_tid (ptid)); + +retry: + + ret = lynx_waitpid (pid, &wstat); + new_ptid = lynx_ptid_build (ret, ((union wait *) &wstat)->w_tid); + + /* If this is a new thread, then add it now. The reason why we do + this here instead of when handling new-thread events is because + we need to add the thread associated to the "main" thread - even + for non-threaded applications where the new-thread events are not + generated. */ + if (!find_thread_ptid (new_ptid)) + add_thread (new_ptid, NULL); + + if (WIFSTOPPED (wstat)) + { + status->kind = TARGET_WAITKIND_STOPPED; + status->value.integer = WSTOPSIG (wstat); + lynx_debug ("process stopped with signal: %d", + status->value.integer); + } + else if (WIFEXITED (wstat)) + { + status->kind = TARGET_WAITKIND_EXITED; + status->value.integer = WEXITSTATUS (wstat); + lynx_clear_inferiors (); + lynx_debug ("process exited with code: %d", status->value.integer); + } + else if (WIFSIGNALED (wstat)) + { + status->kind = TARGET_WAITKIND_SIGNALLED; + status->value.integer = WTERMSIG (wstat); + lynx_clear_inferiors (); + lynx_debug ("process terminated with code: %d", + status->value.integer); + } + else + { + /* Not sure what happened if we get here, or whether we can + in fact get here. But if we do, handle the event the best + we can. */ + status->kind = TARGET_WAITKIND_STOPPED; + status->value.integer = 0; + lynx_debug ("unknown event ????"); + } + + /* SIGTRAP events are generated for situations other than single-step/ + breakpoint events (Eg. new-thread events). Handle those other types + of events, and resume the execution if necessary. */ + if (status->kind == TARGET_WAITKIND_STOPPED + && status->value.integer == SIGTRAP) + { + const int realsig = lynx_ptrace (PTRACE_GETTRACESIG, new_ptid, 0, 0, 0); + + lynx_debug ("(realsig = %d)", realsig); + switch (realsig) + { + case SIGNEWTHREAD: + /* We just added the new thread above. No need to do anything + further. Just resume the execution again. */ + lynx_continue (ptid); + goto retry; + + case SIGTHREADEXIT: + remove_thread (find_thread_ptid (new_ptid)); + lynx_continue (ptid); + goto retry; + } + } + + return new_ptid; +} + +/* A wrapper around lynx_wait_1 that also prints debug traces when + such debug traces have been activated. */ + +static ptid_t +lynx_wait (ptid_t ptid, struct target_waitstatus *status, int options) +{ + ptid_t new_ptid; + + lynx_debug ("lynx_wait (pid = %d, tid = %ld)", + lynx_ptid_get_pid (ptid), lynx_ptid_get_tid (ptid)); + new_ptid = lynx_wait_1 (ptid, status, options); + lynx_debug (" -> (pid=%d, tid=%ld, status->kind = %d)", + lynx_ptid_get_pid (new_ptid), lynx_ptid_get_tid (new_ptid), + status->kind); + return new_ptid; +} + +/* Implement the kill target_ops method. */ + +static int +lynx_kill (int pid) +{ + ptid_t ptid = lynx_ptid_build (pid, 0); + struct target_waitstatus status; + + lynx_ptrace (PTRACE_KILL, ptid, 0, 0, 0); + lynx_wait (ptid, &status, 0); + return 0; +} + +/* Implement the detach target_ops method. */ + +static int +lynx_detach (int pid) +{ + ptid_t ptid = lynx_ptid_build (pid, 0); + + lynx_ptrace (PTRACE_DETACH, ptid, 0, 0, 0); + return 0; +} + +/* Implement the join target_ops method. */ + +static void +lynx_join (int pid) +{ + /* The PTRACE_DETACH is sufficient to detach from the process. + So no need to do anything extra. */ +} + +/* Implement the thread_alive target_ops method. */ + +static int +lynx_thread_alive (ptid_t ptid) +{ + /* The list of threads is updated at the end of each wait, so it + should be up to date. No need to re-fetch it. */ + return (find_thread_ptid (ptid) != NULL); +} + +/* Implement the fetch_registers target_ops method. */ + +static void +lynx_fetch_registers (struct regcache *regcache, int regno) +{ + struct lynx_regset_info *regset = lynx_target_regsets; + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); + + lynx_debug ("lynx_fetch_registers (regno = %d)", regno); + + while (regset->size >= 0) + { + void *buf; + int res; + + buf = xmalloc (regset->size); + res = lynx_ptrace (regset->get_request, inferior_ptid, (int) buf, 0, 0); + if (res < 0) + perror ("ptrace"); + regset->store_function (regcache, buf); + free (buf); + regset++; + } +} + +/* Implement the store_registers target_ops method. */ + +static void +lynx_store_registers (struct regcache *regcache, int regno) +{ + struct lynx_regset_info *regset = lynx_target_regsets; + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); + + lynx_debug ("lynx_store_registers (regno = %d)", regno); + + while (regset->size >= 0) + { + void *buf; + int res; + + buf = xmalloc (regset->size); + res = lynx_ptrace (regset->get_request, inferior_ptid, (int) buf, 0, 0); + if (res == 0) + { + /* Then overlay our cached registers on that. */ + regset->fill_function (regcache, buf); + /* Only now do we write the register set. */ + res = lynx_ptrace (regset->set_request, inferior_ptid, (int) buf, + 0, 0); + } + if (res < 0) + perror ("ptrace"); + free (buf); + regset++; + } +} + +/* Implement the read_memory target_ops method. */ + +static int +lynx_read_memory (CORE_ADDR memaddr, unsigned char *myaddr, int len) +{ + /* On LynxOS, memory reads needs to be performed in chunks the size + of int types, and they should also be aligned accordingly. */ + int buf; + const int xfer_size = sizeof (buf); + CORE_ADDR addr = memaddr & -(CORE_ADDR)xfer_size; + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); + + while (addr < memaddr + len) + { + int skip = 0; + int truncate = 0; + + errno = 0; + if (addr < memaddr) + skip = memaddr - addr; + if (addr + xfer_size > memaddr + len) + truncate = addr + xfer_size - memaddr - len; + buf = lynx_ptrace (PTRACE_PEEKTEXT, inferior_ptid, addr, 0, 0); + if (errno) + return errno; + memcpy (myaddr + (addr - memaddr) + skip, (gdb_byte *)&buf + skip, + xfer_size - skip - truncate); + addr += xfer_size; + } + + return 0; +} + +/* Implement the write_memory target_ops method. */ + +static int +lynx_write_memory (CORE_ADDR memaddr, const unsigned char *myaddr, int len) +{ + /* On LynxOS, memory writes needs to be performed in chunks the size + of int types, and they should also be aligned accordingly. */ + int buf; + const int xfer_size = sizeof (buf); + CORE_ADDR addr = memaddr & -(CORE_ADDR)xfer_size; + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); + + while (addr < memaddr + len) + { + int skip = 0; + int truncate = 0; + + if (addr < memaddr) + skip = memaddr - addr; + if (addr + xfer_size > memaddr + len) + truncate = addr + xfer_size - memaddr - len; + if (skip > 0 || truncate > 0) + /* We need to read the memory at this address in order to preserve + the data that we are not overwriting. */ + lynx_read_memory (addr, (unsigned char *) &buf, xfer_size); + if (errno) + return errno; + memcpy ((gdb_byte *) &buf + skip, myaddr + (addr - memaddr) + skip, + xfer_size - skip - truncate); + errno = 0; + lynx_ptrace (PTRACE_POKETEXT, inferior_ptid, addr, buf, 0); + if (errno) + return errno; + addr += xfer_size; + } + + return 0; +} + +/* Implement the kill_request target_ops method. */ + +static void +lynx_request_interrupt (void) +{ + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); + + kill (lynx_ptid_get_pid (inferior_ptid), SIGINT); +} + +/* The LynxOS target_ops vector. */ + +static struct target_ops lynx_target_ops = { + lynx_create_inferior, + lynx_attach, + lynx_kill, + lynx_detach, + NULL, /* mourn */ + lynx_join, + lynx_thread_alive, + lynx_resume, + lynx_wait, + lynx_fetch_registers, + lynx_store_registers, + lynx_read_memory, + lynx_write_memory, + NULL, /* look_up_symbols */ + lynx_request_interrupt, + NULL, /* read_auxv */ + NULL, /* insert_point */ + NULL, /* remove_point */ + NULL, /* stopped_by_watchpoint */ + NULL, /* stopped_data_address */ + NULL, /* read_offsets */ + NULL, /* get_tls_address */ + NULL, /* qxfer_spu */ + NULL, /* hostio_last_error */ + NULL, /* qxfer_osdata */ + NULL, /* qxfer_siginfo */ + NULL, /* supports_non_stop */ + NULL, /* async */ + NULL, /* start_non_stop */ + NULL, /* supports_multi_process */ + NULL, /* handle_monitor_command */ +}; + +void +initialize_low (void) +{ + set_target_ops (&lynx_target_ops); + the_low_target.arch_setup (); +} + diff --git a/gdb/gdbserver/lynx-low.h b/gdb/gdbserver/lynx-low.h new file mode 100644 index 0000000..9f2ce30 --- /dev/null +++ b/gdb/gdbserver/lynx-low.h @@ -0,0 +1,57 @@ +/* Copyright (C) 2010 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include "server.h" + +struct regcache; + +/* Some information relative to a given register set. */ + +struct lynx_regset_info +{ + /* The ptrace request needed to get/set registers of this set. */ + int get_request, set_request; + /* The size of the register set. */ + int size; + /* Fill the buffer BUF from the contents of the given REGCACHE. */ + void (*fill_function) (struct regcache *regcache, void *buf); + /* Store the register value in BUF in the given REGCACHE. */ + void (*store_function) (struct regcache *regcache, const void *buf); +}; + +/* A list of regsets for the target being debugged, terminated by an entry + where the size is negative. + + This list should be created by the target-specific code. */ + +extern struct lynx_regset_info lynx_target_regsets[]; + +/* The target-specific operations for LynxOS support. */ + +struct lynx_target_ops +{ + /* Architecture-specific setup. */ + void (*arch_setup) (void); +}; + +extern struct lynx_target_ops the_low_target; + +/* LynxOS-specific ptid handling. */ + +ptid_t lynx_ptid_build (int pid, long tid); +int lynx_ptid_get_pid (ptid_t ptid); +long lynx_ptid_get_tid (ptid_t ptid); diff --git a/gdb/gdbserver/lynx-ppc-low.c b/gdb/gdbserver/lynx-ppc-low.c new file mode 100644 index 0000000..6002060 --- /dev/null +++ b/gdb/gdbserver/lynx-ppc-low.c @@ -0,0 +1,186 @@ +/* Copyright (C) 2009, 2010 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include "server.h" +#include "lynx-low.h" + +#include <stdint.h> +#include <stddef.h> +#include <limits.h> +#include <ptrace.h> + +/* The following two typedefs are defined in a .h file which is not + in the standard include path (/sys/include/family/ppc/ucontext.h), + so we just duplicate them here. */ + +/* General register context */ +typedef struct usr_econtext_s +{ + uint32_t uec_iregs[32]; + uint32_t uec_inum; + uint32_t uec_srr0; + uint32_t uec_srr1; + uint32_t uec_lr; + uint32_t uec_ctr; + uint32_t uec_cr; + uint32_t uec_xer; + uint32_t uec_dar; + uint32_t uec_mq; + uint32_t uec_msr; + uint32_t uec_sregs[16]; + uint32_t uec_ss_count; + uint32_t uec_ss_addr1; + uint32_t uec_ss_addr2; + uint32_t uec_ss_code1; + uint32_t uec_ss_code2; +} usr_econtext_t; + +/* Floating point register context */ +typedef struct usr_fcontext_s +{ + uint64_t ufc_freg[32]; + uint32_t ufc_fpscr[2]; +} usr_fcontext_t; + +/* Index of for various registers inside the regcache. */ +#define R0_REGNUM 0 +#define F0_REGNUM 32 +#define PC_REGNUM 64 +#define MSR_REGNUM 65 +#define CR_REGNUM 66 +#define LR_REGNUM 67 +#define CTR_REGNUM 68 +#define XER_REGNUM 69 +#define FPSCR_REGNUM 70 + +/* Defined in auto-generated file powerpc-32.c. */ +extern void init_registers_powerpc_32 (void); + +/* The fill_function for the general-purpose register set. */ + +static void +lynx_ppc_fill_gregset (struct regcache *regcache, void *buf) +{ + int i; + + /* r0 - r31 */ + for (i = 0; i < 32; i++) + collect_register (regcache, R0_REGNUM + i, + buf + offsetof (usr_econtext_t, uec_iregs[i])); + + /* The other registers provided in the GP register context. */ + collect_register (regcache, PC_REGNUM, + buf + offsetof (usr_econtext_t, uec_srr0)); + collect_register (regcache, MSR_REGNUM, + buf + offsetof (usr_econtext_t, uec_srr1)); + collect_register (regcache, CR_REGNUM, + buf + offsetof (usr_econtext_t, uec_cr)); + collect_register (regcache, LR_REGNUM, + buf + offsetof (usr_econtext_t, uec_lr)); + collect_register (regcache, CTR_REGNUM, + buf + offsetof (usr_econtext_t, uec_ctr)); + collect_register (regcache, XER_REGNUM, + buf + offsetof (usr_econtext_t, uec_xer)); +} + +/* The store_function for the general-purpose register set. */ + +static void +lynx_ppc_store_gregset (struct regcache *regcache, const void *buf) +{ + int i; + + /* r0 - r31 */ + for (i = 0; i < 32; i++) + supply_register (regcache, R0_REGNUM + i, + buf + offsetof (usr_econtext_t, uec_iregs[i])); + + /* The other registers provided in the GP register context. */ + supply_register (regcache, PC_REGNUM, + buf + offsetof (usr_econtext_t, uec_srr0)); + supply_register (regcache, MSR_REGNUM, + buf + offsetof (usr_econtext_t, uec_srr1)); + supply_register (regcache, CR_REGNUM, + buf + offsetof (usr_econtext_t, uec_cr)); + supply_register (regcache, LR_REGNUM, + buf + offsetof (usr_econtext_t, uec_lr)); + supply_register (regcache, CTR_REGNUM, + buf + offsetof (usr_econtext_t, uec_ctr)); + supply_register (regcache, XER_REGNUM, + buf + offsetof (usr_econtext_t, uec_xer)); +} + +/* The fill_function for the floating-point register set. */ + +static void +lynx_ppc_fill_fpregset (struct regcache *regcache, void *buf) +{ + int i; + + /* f0 - f31 */ + for (i = 0; i < 32; i++) + collect_register (regcache, F0_REGNUM + i, + buf + offsetof (usr_fcontext_t, ufc_freg[i])); + + /* fpscr */ + collect_register (regcache, FPSCR_REGNUM, + buf + offsetof (usr_fcontext_t, ufc_fpscr)); +} + +/* The store_function for the floating-point register set. */ + +static void +lynx_ppc_store_fpregset (struct regcache *regcache, const void *buf) +{ + int i; + + /* f0 - f31 */ + for (i = 0; i < 32; i++) + supply_register (regcache, F0_REGNUM + i, + buf + offsetof (usr_fcontext_t, ufc_freg[i])); + + /* fpscr */ + supply_register (regcache, FPSCR_REGNUM, + buf + offsetof (usr_fcontext_t, ufc_fpscr)); +} + +/* Implements the lynx_target_ops.arch_setup routine. */ + +static void +lynx_ppc_arch_setup (void) +{ + init_registers_powerpc_32 (); +} + +/* Description of all the powerpc-lynx register sets. */ + +struct lynx_regset_info lynx_target_regsets[] = { + /* General Purpose Registers. */ + {PTRACE_GETREGS, PTRACE_SETREGS, sizeof(usr_econtext_t), + lynx_ppc_fill_gregset, lynx_ppc_store_gregset}, + /* Floating Point Registers. */ + { PTRACE_GETFPREGS, PTRACE_SETFPREGS, sizeof(usr_fcontext_t), + lynx_ppc_fill_fpregset, lynx_ppc_store_fpregset }, + /* End of list marker. */ + {0, 0, -1, NULL, NULL } +}; + +/* The lynx_target_ops vector for powerpc-lynxos. */ + +struct lynx_target_ops the_low_target = { + lynx_ppc_arch_setup, +}; diff --git a/gdb/gdbserver/lynx-ptrace.c b/gdb/gdbserver/lynx-ptrace.c new file mode 100644 index 0000000..9654cd6 --- /dev/null +++ b/gdb/gdbserver/lynx-ptrace.c @@ -0,0 +1,262 @@ +/* Copyright (C) 2010 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include "server.h" +#include "lynx-ptrace.h" + +#include <limits.h> +#include <ptrace.h> +#include <sys/piddef.h> /* Provides PIDGET, TIDGET, BUILDPID, etc. */ + +static int +lynx_ptrace_pid_from_ptid (ptid_t ptid) +{ + return BUILDPID (lynx_ptid_get_pid (ptid), lynx_ptid_get_tid (ptid)); +} + +/* Return a string image of the ptrace REQUEST number. */ + +static char * +ptrace_request_to_str (int request) +{ + switch (request) + { + case PTRACE_TRACEME: + return "PTRACE_TRACEME"; + break; + case PTRACE_PEEKTEXT: + return "PTRACE_PEEKTEXT"; + break; + case PTRACE_PEEKDATA: + return "PTRACE_PEEKDATA"; + break; + case PTRACE_PEEKUSER: + return "PTRACE_PEEKUSER"; + break; + case PTRACE_POKETEXT: + return "PTRACE_POKETEXT"; + break; + case PTRACE_POKEDATA: + return "PTRACE_POKEDATA"; + break; + case PTRACE_POKEUSER: + return "PTRACE_POKEUSER"; + break; + case PTRACE_CONT: + return "PTRACE_CONT"; + break; + case PTRACE_KILL: + return "PTRACE_KILL"; + break; + case PTRACE_SINGLESTEP: + return "PTRACE_SINGLESTEP"; + break; + case PTRACE_ATTACH: + return "PTRACE_ATTACH"; + break; + case PTRACE_DETACH: + return "PTRACE_DETACH"; + break; + case PTRACE_GETREGS: + return "PTRACE_GETREGS"; + break; + case PTRACE_SETREGS: + return "PTRACE_SETREGS"; + break; + case PTRACE_GETFPREGS: + return "PTRACE_GETFPREGS"; + break; + case PTRACE_SETFPREGS: + return "PTRACE_SETFPREGS"; + break; + case PTRACE_READDATA: + return "PTRACE_READDATA"; + break; + case PTRACE_WRITEDATA: + return "PTRACE_WRITEDATA"; + break; + case PTRACE_READTEXT: + return "PTRACE_READTEXT"; + break; + case PTRACE_WRITETEXT: + return "PTRACE_WRITETEXT"; + break; + case PTRACE_GETFPAREGS: + return "PTRACE_GETFPAREGS"; + break; + case PTRACE_SETFPAREGS: + return "PTRACE_SETFPAREGS"; + break; + case PTRACE_GETWINDOW: + return "PTRACE_GETWINDOW"; + break; + case PTRACE_SETWINDOW: + return "PTRACE_SETWINDOW"; + break; + case PTRACE_SYSCALL: + return "PTRACE_SYSCALL"; + break; + case PTRACE_DUMPCORE: + return "PTRACE_DUMPCORE"; + break; + case PTRACE_SETWRBKPT: + return "PTRACE_SETWRBKPT"; + break; + case PTRACE_SETACBKPT: + return "PTRACE_SETACBKPT"; + break; + case PTRACE_CLRBKPT: + return "PTRACE_CLRBKPT"; + break; + case PTRACE_GET_UCODE: + return "PTRACE_GET_UCODE"; + break; +#ifdef PT_READ_GPR + case PT_READ_GPR: + return "PT_READ_GPR"; + break; +#endif +#ifdef PT_WRITE_GPR + case PT_WRITE_GPR: + return "PT_WRITE_GPR"; + break; +#endif +#ifdef PT_READ_FPR + case PT_READ_FPR: + return "PT_READ_FPR"; + break; +#endif +#ifdef PT_WRITE_FPR + case PT_WRITE_FPR: + return "PT_WRITE_FPR"; + break; +#endif +#ifdef PTRACE_GETVECREGS + case PTRACE_GETVECREGS: + return "PTRACE_GETVECREGS"; + break; +#endif +#ifdef PTRACE_SETVECREGS + case PTRACE_SETVECREGS: + return "PTRACE_SETVECREGS"; + break; +#endif +#ifdef PT_READ_VPR + case PT_READ_VPR: + return "PT_READ_VPR"; + break; +#endif +#ifdef PT_WRITE_VPR + case PT_WRITE_VPR: + return "PT_WRITE_VPR"; + break; +#endif +#ifdef PTRACE_PEEKUSP + case PTRACE_PEEKUSP: + return "PTRACE_PEEKUSP"; + break; +#endif +#ifdef PTRACE_POKEUSP + case PTRACE_POKEUSP: + return "PTRACE_POKEUSP"; + break; +#endif + case PTRACE_PEEKTHREAD: + return "PTRACE_PEEKTHREAD"; + break; + case PTRACE_THREADUSER: + return "PTRACE_THREADUSER"; + break; + case PTRACE_FPREAD: + return "PTRACE_FPREAD"; + break; + case PTRACE_FPWRITE: + return "PTRACE_FPWRITE"; + break; + case PTRACE_SETSIG: + return "PTRACE_SETSIG"; + break; + case PTRACE_CONT_ONE: + return "PTRACE_CONT_ONE"; + break; + case PTRACE_KILL_ONE: + return "PTRACE_KILL_ONE"; + break; + case PTRACE_SINGLESTEP_ONE: + return "PTRACE_SINGLESTEP_ONE"; + break; + case PTRACE_GETLOADINFO: + return "PTRACE_GETLOADINFO"; + break; + case PTRACE_GETTHREADLIST: + return "PTRACE_GETTHREADLIST"; + break; + case PTRACE_POSTSYSCALL: + return "PTRACE_POSTSYSCALL"; + break; + case PTRACE_USE_SIGEXECED: + return "PTRACE_USE_SIGEXECED"; + break; + case PTRACE_GETTRACESIG: + return "PTRACE_GETTRACESIG"; + break; + case PTRACE_GETCWD: + return "PTRACE_GETCWD"; + break; + case PTRACE_TRAPFORK: + return "PTRACE_TRAPFORK"; + break; + case PTRACE_GETCHILDPID: + return "PTRACE_GETCHILDPID"; + break; + case PTRACE_SYSCALL_ONE: + return "PTRACE_SYSCALL_ONE"; + break; + case PTRACE_SIGMASK: + return "PTRACE_SIGMASK"; + break; + case PTRACE_GETIWD: + return "PTRACE_GETIWD"; + break; + case PTRACE_GETEXECFILE: + return "PTRACE_GETEXECFILE"; + break; + } + return "<unknown-request>"; +} + +/* A wrapper around ptrace that allows us to print debug traces of + ptrace calls if debug traces are activated. */ + +int +lynx_ptrace (int request, ptid_t ptid, int addr, int data, int addr2) +{ + int result; + const int pid = lynx_ptrace_pid_from_ptid (ptid); + + if (debug_threads) + printf ("PTRACE (%s, pid=%d(pid=%d, tid=%d), addr=0x%x, data=0x%x, " + "addr2=0x%x)", + ptrace_request_to_str (request), pid, PIDGET (pid), TIDGET (pid), + addr, data, addr2); + result = ptrace (request, pid, addr, data, addr2); + if (debug_threads) + printf (" -> %d (=0x%x)\n", result, result); + + return result; +} + diff --git a/gdb/gdbserver/lynx-ptrace.h b/gdb/gdbserver/lynx-ptrace.h new file mode 100644 index 0000000..dc39550 --- /dev/null +++ b/gdb/gdbserver/lynx-ptrace.h @@ -0,0 +1,26 @@ +/* Copyright (C) 2010 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#ifndef LYNX_PTRACE_H +#define LYNX_PTRACE_H + +#include "server.h" + +int lynx_ptrace (int request, ptid_t ptid, int addr, int data, int addr2); + +#endif + -- 1.7.0.4 ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [RFA 3/3] gdbserver support for powerpc-lynxos (4.x) 2010-06-23 17:46 ` [RFA 3/3] gdbserver support for powerpc-lynxos (4.x) Joel Brobecker @ 2010-07-27 16:13 ` Pedro Alves 2010-08-31 19:38 ` Joel Brobecker 0 siblings, 1 reply; 13+ messages in thread From: Pedro Alves @ 2010-07-27 16:13 UTC (permalink / raw) To: gdb-patches; +Cc: Joel Brobecker Hi Joel. Sorry for how long it took to get to this... On Wednesday 23 June 2010 18:46:17, Joel Brobecker wrote: > This patch adds support for powerpc-lynxos. > > Note that I'm adding a new varialble "srv_extra_libs" in configure.srv. > I need this because I need to link against -linet. Perhaps the right way > of doing things might have been to use a configure check... Are all lynxos archs going to need that? Sound like you could add to this: gdbserver/configure.ac: if test "${srv_mingwce}" = "yes"; then LIBS="$LIBS -lws2" elif test "${srv_mingw}" = "yes"; then LIBS="$LIBS -lws2_32" elif test "${srv_qnx}" = "yes"; then LIBS="$LIBS -lsocket" fi > > gdbserver/ChangeLog: > > * gdbserver/lynx-debug.c, gdbserver/lynx-debug.h, > gdbserver/lynx-low.c, gdbserver/lynx-low.h, gdbserver/lynx-ppc-low.c, > gdbserver/lynx-ptrace.c, gdbserver/lynx-ptrace.h: New files. > * Makefile.in (lynx_debug_h, lynx_ptrace_h, lynx_low_h): New variables. > (lynx-debug.o, lynx-low.o, lynx-ppc-low.o, lynx-ptrace.o): New rules. > * configure.ac: Add support for srv_extra_libs variable. > * configure.srv: Add handling of powerpc-*-lynxos* targets. > * configure: regenerate. This looks generaly okay. It may need a couple of tweaks for target_ops vector additions. Quite honesly, the split out of lynx-debug.c and lynx-ptrace.c looks overkill to me. I'd prefer getting rid of those (and their headers), and just put their contents on top of lynx-low.c, and make the functions static. I made a few comments inline below. > new file mode 100644 > index 0000000..396df2b > --- /dev/null > +++ b/gdb/gdbserver/lynx-debug.h > @@ -0,0 +1,26 @@ > +/* Copyright (C) 2010 Free Software Foundation, Inc. > + > + This file is part of GDB. > + > + This program is free software; you can redistribute it and/or modify > + it under the terms of the GNU General Public License as published by > + the Free Software Foundation; either version 3 of the License, or > + (at your option) any later version. > + > + This program is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + GNU General Public License for more details. > + > + You should have received a copy of the GNU General Public License > + along with this program. If not, see <http://www.gnu.org/licenses/>. */ > + > +#ifndef LYNX_DEBUG_H > +#define LYNX_DEBUG_H > + > +#include "server.h" > + > +/* Print a debug trace on standard output if debug_threads is set. */ > +extern void lynx_debug (char *string, ...) ATTR_FORMAT (printf, 1, 2); > + > +#endif > diff --git a/gdb/gdbserver/lynx-low.c b/gdb/gdbserver/lynx-low.c > new file mode 100644 > index 0000000..50cc26a > --- /dev/null > +++ b/gdb/gdbserver/lynx-low.c > @@ -0,0 +1,531 @@ > +/* Copyright (C) 2009, 2010 Free Software Foundation, Inc. > + > + This file is part of GDB. > + > + This program is free software; you can redistribute it and/or modify > + it under the terms of the GNU General Public License as published by > + the Free Software Foundation; either version 3 of the License, or > + (at your option) any later version. > + > + This program is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + GNU General Public License for more details. > + > + You should have received a copy of the GNU General Public License > + along with this program. If not, see <http://www.gnu.org/licenses/>. */ > + > +#include "server.h" > +#include "target.h" > +#include "lynx-low.h" > +#include "lynx-debug.h" > +#include "lynx-ptrace.h" > + > +#include <limits.h> > +#include <ptrace.h> > +#include <sys/piddef.h> /* Provides PIDGET, TIDGET, BUILDPID, etc. */ > +#include <unistd.h> > +#include <sys/ioctl.h> > +#include <sys/types.h> > +#include <sys/wait.h> > +#include <signal.h> > + > +int using_threads = 1; > + > +/* Build a ptid_t given a PID and a LynxOS TID. */ > + > +ptid_t > +lynx_ptid_build (int pid, long tid) > +{ > + /* brobecker/2010-06-21: It looks like the LWP field in ptids > + should be distinct for each thread (see write_ptid where it > + writes the thread ID from the LWP). So instead of storing > + the LynxOS tid in the tid field of the ptid, we store it in > + the lwp field. */ > + return ptid_build (pid, tid, 0); > +} Right, the remote serial protocol has no concept (as of yet) of lwp vs tid, so we're using the lwp field for storing thread ids throughout all ports currently. > + > +/* Return the process ID of the given PTID. > + > + This function has little reason to exist, it's just a wrapper around > + ptid_get_pid. But since we have a getter function for the lynxos > + ptid, it feels cleaner to have a getter for the pid as well. */ > + > +int > +lynx_ptid_get_pid (ptid_t ptid) > +{ > + return ptid_get_pid (ptid); > +} > + > +/* Return the LynxOS tid of the given PTID. */ > + > +long > +lynx_ptid_get_tid (ptid_t ptid) > +{ > + /* See lynx_ptid_build: The LynxOS tid is stored inside the lwp field > + of the ptid. */ > + return ptid_get_lwp (ptid); > +} > + > +/* Implement the create_inferior method of the target_ops vector. */ > + > +static int > +lynx_create_inferior (char *program, char **allargs) > +{ > + void *new_process; struct process_info *process. Though, this variable appears to be write only. > + int pid; > + > + lynx_debug ("lynx_create_inferior ()"); > + > + pid = fork (); > + if (pid < 0) > + perror_with_name ("fork"); > + > + if (pid == 0) > + { > + int pgrp; > + > + /* Switch child to its own process group so that signals won't > + directly affect gdbserver. */ > + pgrp = getpid(); > + setpgid (0, pgrp); > + ioctl (0, TIOCSPGRP, &pgrp); > + lynx_ptrace (PTRACE_TRACEME, null_ptid, 0, 0, 0); > + execv (program, allargs); > + fprintf (stderr, "Cannot exec %s: %s.\n", program, strerror (errno)); > + fflush (stderr); > + _exit (0177); > + } > + > + new_process = add_process (pid, 0); > + /* Do not add the process thread just yet, as we do not know its tid. > + We will add it later, during the wait for the STOP event corresponding > + to the lynx_ptrace (PTRACE_TRACEME) call above. */ > + return pid; > +} > + > +/* Implement the attach target_ops method. */ > + > +static int > +lynx_attach (unsigned long pid) > +{ > + struct process_info *new_process; > + ptid_t ptid = lynx_ptid_build (pid, 0); > + > + if (lynx_ptrace (PTRACE_ATTACH, ptid, 0, 0, 0) != 0) > + error ("Cannot attach to process %lu: %s (%d)\n", pid, > + strerror (errno), errno); > + > + new_process = (struct process_info *) add_process (pid, 1); Please remove the unnecessary cast. > + add_thread (ptid, NULL); > + > + return 0; > +} > + > +/* Implement the resume target_ops method. */ > + > +static void > +lynx_resume (struct thread_resume *resume_info, size_t n) > +{ > + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); > + /* FIXME: Assume for now that n == 1. */ > + const int request = (resume_info[0].kind == resume_step > + ? PTRACE_SINGLESTEP : PTRACE_CONT); > + const int signal = resume_info[0].sig; > + int ret; > + > + regcache_invalidate (); > + ret = lynx_ptrace (request, inferior_ptid, 1, signal, 0); > +} > + > +/* Resume the execution of the given PTID. */ > + > +static void > +lynx_continue (ptid_t ptid) > +{ > + struct thread_resume resume_info; > + > + resume_info.thread = ptid; > + resume_info.kind = resume_continue; > + resume_info.sig = 0; > + > + lynx_resume (&resume_info, 1); > +} > + > +/* Remove all inferiors and associated threads. */ > + > +static void > +lynx_clear_inferiors (void) > +{ > + /* We do not use private data, so nothing much to do except calling > + clear_inferiors. */ > + clear_inferiors (); > +} > + > +/* A wrapper around waitpid that handles the various idiosyncrasies > + of LynxOS' waitpid. */ > + > +static int > +lynx_waitpid (int pid, int *stat_loc) > +{ > + int ret = 0; > + > + while (1) > + { > + ret = waitpid (pid, stat_loc, WNOHANG); > + if (ret < 0) > + { > + /* An ECHILD error is not indicative of a real problem. > + It happens for instance while waiting for the inferior > + to stop after attaching to it. */ > + if (errno != ECHILD) > + perror_with_name ("waitpid (WNOHANG)"); > + } > + if (ret > 0) > + break; > + /* No event with WNOHANG. See if there is one with WUNTRACED. */ > + ret = waitpid (pid, stat_loc, WNOHANG | WUNTRACED); > + if (ret < 0) > + { > + /* An ECHILD error is not indicative of a real problem. > + It happens for instance while waiting for the inferior > + to stop after attaching to it. */ > + if (errno != ECHILD) > + perror_with_name ("waitpid (WNOHANG|WUNTRACED)"); > + } > + if (ret > 0) > + break; > + usleep (1000); > + } > + return ret; > +} Make sure you don't need to handle EINTR here. You may want to take a look at linux-low.c:my_waitpid and see whether you could do something of the sorts, to be able to get rid of the usleep. > + > +/* Implement the wait target_ops method. */ > + > +static ptid_t > +lynx_wait_1 (ptid_t ptid, struct target_waitstatus *status, int options) > +{ > + int pid; > + int ret; > + int wstat; > + ptid_t new_ptid; > + > + if (ptid_equal (ptid, minus_one_ptid)) > + pid = lynx_ptid_get_pid (thread_to_gdb_id (current_inferior)); > + else > + pid = BUILDPID (lynx_ptid_get_pid (ptid), lynx_ptid_get_tid (ptid)); > + > +retry: > + > + ret = lynx_waitpid (pid, &wstat); > + new_ptid = lynx_ptid_build (ret, ((union wait *) &wstat)->w_tid); > + > + /* If this is a new thread, then add it now. The reason why we do > + this here instead of when handling new-thread events is because > + we need to add the thread associated to the "main" thread - even > + for non-threaded applications where the new-thread events are not > + generated. */ > + if (!find_thread_ptid (new_ptid)) > + add_thread (new_ptid, NULL); > + > + if (WIFSTOPPED (wstat)) > + { > + status->kind = TARGET_WAITKIND_STOPPED; > + status->value.integer = WSTOPSIG (wstat); This should go through target_signal_from_host. > + lynx_debug ("process stopped with signal: %d", > + status->value.integer); > + } > + else if (WIFEXITED (wstat)) > + { > + status->kind = TARGET_WAITKIND_EXITED; > + status->value.integer = WEXITSTATUS (wstat); > + lynx_clear_inferiors (); These lynx_clear_inferiors calls should now move the the target_ops->mourn callback. > + lynx_debug ("process exited with code: %d", status->value.integer); > + } > + else if (WIFSIGNALED (wstat)) > + { > + status->kind = TARGET_WAITKIND_SIGNALLED; > + status->value.integer = WTERMSIG (wstat); > + lynx_clear_inferiors (); > + lynx_debug ("process terminated with code: %d", > + status->value.integer); > + } > + else > + { > + /* Not sure what happened if we get here, or whether we can > + in fact get here. But if we do, handle the event the best > + we can. */ > + status->kind = TARGET_WAITKIND_STOPPED; > + status->value.integer = 0; > + lynx_debug ("unknown event ????"); > + } > + > + /* SIGTRAP events are generated for situations other than single-step/ > + breakpoint events (Eg. new-thread events). Handle those other types > + of events, and resume the execution if necessary. */ > + if (status->kind == TARGET_WAITKIND_STOPPED > + && status->value.integer == SIGTRAP) `enum target_signal' vs host signal mixup continued. > + { > + const int realsig = lynx_ptrace (PTRACE_GETTRACESIG, new_ptid, 0, 0, 0); > + > + lynx_debug ("(realsig = %d)", realsig); > + switch (realsig) > + { > + case SIGNEWTHREAD: > + /* We just added the new thread above. No need to do anything > + further. Just resume the execution again. */ > + lynx_continue (ptid); > + goto retry; > + > + case SIGTHREADEXIT: > + remove_thread (find_thread_ptid (new_ptid)); > + lynx_continue (ptid); > + goto retry; > + } > + } > + > + return new_ptid; > +} > + > +/* A wrapper around lynx_wait_1 that also prints debug traces when > + such debug traces have been activated. */ > + > +static ptid_t > +lynx_wait (ptid_t ptid, struct target_waitstatus *status, int options) > +{ > + ptid_t new_ptid; > + > + lynx_debug ("lynx_wait (pid = %d, tid = %ld)", > + lynx_ptid_get_pid (ptid), lynx_ptid_get_tid (ptid)); > + new_ptid = lynx_wait_1 (ptid, status, options); > + lynx_debug (" -> (pid=%d, tid=%ld, status->kind = %d)", > + lynx_ptid_get_pid (new_ptid), lynx_ptid_get_tid (new_ptid), > + status->kind); > + return new_ptid; > +} > + > +/* Implement the kill target_ops method. */ > + > +static int > +lynx_kill (int pid) > +{ > + ptid_t ptid = lynx_ptid_build (pid, 0); > + struct target_waitstatus status; > + > + lynx_ptrace (PTRACE_KILL, ptid, 0, 0, 0); > + lynx_wait (ptid, &status, 0); > + return 0; > +} > + > +/* Implement the detach target_ops method. */ > + > +static int > +lynx_detach (int pid) > +{ > + ptid_t ptid = lynx_ptid_build (pid, 0); > + > + lynx_ptrace (PTRACE_DETACH, ptid, 0, 0, 0); > + return 0; > +} > + > +/* Implement the join target_ops method. */ > + > +static void > +lynx_join (int pid) > +{ > + /* The PTRACE_DETACH is sufficient to detach from the process. > + So no need to do anything extra. */ > +} > + > +/* Implement the thread_alive target_ops method. */ > + > +static int > +lynx_thread_alive (ptid_t ptid) > +{ > + /* The list of threads is updated at the end of each wait, so it > + should be up to date. No need to re-fetch it. */ > + return (find_thread_ptid (ptid) != NULL); > +} > + > +/* Implement the fetch_registers target_ops method. */ > + > +static void > +lynx_fetch_registers (struct regcache *regcache, int regno) > +{ > + struct lynx_regset_info *regset = lynx_target_regsets; > + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); > + > + lynx_debug ("lynx_fetch_registers (regno = %d)", regno); > + > + while (regset->size >= 0) > + { > + void *buf; > + int res; > + > + buf = xmalloc (regset->size); > + res = lynx_ptrace (regset->get_request, inferior_ptid, (int) buf, 0, 0); > + if (res < 0) > + perror ("ptrace"); > + regset->store_function (regcache, buf); > + free (buf); > + regset++; > + } > +} > + > +/* Implement the store_registers target_ops method. */ > + > +static void > +lynx_store_registers (struct regcache *regcache, int regno) > +{ > + struct lynx_regset_info *regset = lynx_target_regsets; > + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); > + > + lynx_debug ("lynx_store_registers (regno = %d)", regno); > + > + while (regset->size >= 0) > + { > + void *buf; > + int res; > + > + buf = xmalloc (regset->size); > + res = lynx_ptrace (regset->get_request, inferior_ptid, (int) buf, 0, 0); > + if (res == 0) > + { > + /* Then overlay our cached registers on that. */ > + regset->fill_function (regcache, buf); > + /* Only now do we write the register set. */ > + res = lynx_ptrace (regset->set_request, inferior_ptid, (int) buf, > + 0, 0); > + } > + if (res < 0) > + perror ("ptrace"); > + free (buf); > + regset++; > + } > +} > + > +/* Implement the read_memory target_ops method. */ > + > +static int > +lynx_read_memory (CORE_ADDR memaddr, unsigned char *myaddr, int len) > +{ > + /* On LynxOS, memory reads needs to be performed in chunks the size > + of int types, and they should also be aligned accordingly. */ > + int buf; > + const int xfer_size = sizeof (buf); > + CORE_ADDR addr = memaddr & -(CORE_ADDR)xfer_size; > + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); > + > + while (addr < memaddr + len) > + { > + int skip = 0; > + int truncate = 0; > + > + errno = 0; > + if (addr < memaddr) > + skip = memaddr - addr; > + if (addr + xfer_size > memaddr + len) > + truncate = addr + xfer_size - memaddr - len; > + buf = lynx_ptrace (PTRACE_PEEKTEXT, inferior_ptid, addr, 0, 0); > + if (errno) > + return errno; > + memcpy (myaddr + (addr - memaddr) + skip, (gdb_byte *)&buf + skip, > + xfer_size - skip - truncate); > + addr += xfer_size; > + } > + > + return 0; > +} > + > +/* Implement the write_memory target_ops method. */ > + > +static int > +lynx_write_memory (CORE_ADDR memaddr, const unsigned char *myaddr, int len) > +{ > + /* On LynxOS, memory writes needs to be performed in chunks the size > + of int types, and they should also be aligned accordingly. */ > + int buf; > + const int xfer_size = sizeof (buf); > + CORE_ADDR addr = memaddr & -(CORE_ADDR)xfer_size; > + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); > + > + while (addr < memaddr + len) > + { > + int skip = 0; > + int truncate = 0; > + > + if (addr < memaddr) > + skip = memaddr - addr; > + if (addr + xfer_size > memaddr + len) > + truncate = addr + xfer_size - memaddr - len; > + if (skip > 0 || truncate > 0) > + /* We need to read the memory at this address in order to preserve > + the data that we are not overwriting. */ > + lynx_read_memory (addr, (unsigned char *) &buf, xfer_size); > + if (errno) > + return errno; > + memcpy ((gdb_byte *) &buf + skip, myaddr + (addr - memaddr) + skip, > + xfer_size - skip - truncate); > + errno = 0; > + lynx_ptrace (PTRACE_POKETEXT, inferior_ptid, addr, buf, 0); > + if (errno) > + return errno; > + addr += xfer_size; > + } > + > + return 0; > +} > + > +/* Implement the kill_request target_ops method. */ > + > +static void > +lynx_request_interrupt (void) > +{ > + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); > + > + kill (lynx_ptid_get_pid (inferior_ptid), SIGINT); > +} > + > +/* The LynxOS target_ops vector. */ > + > +static struct target_ops lynx_target_ops = { > + lynx_create_inferior, > + lynx_attach, > + lynx_kill, > + lynx_detach, > + NULL, /* mourn */ > + lynx_join, > + lynx_thread_alive, > + lynx_resume, > + lynx_wait, > + lynx_fetch_registers, > + lynx_store_registers, > + lynx_read_memory, > + lynx_write_memory, > + NULL, /* look_up_symbols */ > + lynx_request_interrupt, > + NULL, /* read_auxv */ > + NULL, /* insert_point */ > + NULL, /* remove_point */ > + NULL, /* stopped_by_watchpoint */ > + NULL, /* stopped_data_address */ > + NULL, /* read_offsets */ > + NULL, /* get_tls_address */ > + NULL, /* qxfer_spu */ > + NULL, /* hostio_last_error */ > + NULL, /* qxfer_osdata */ > + NULL, /* qxfer_siginfo */ > + NULL, /* supports_non_stop */ > + NULL, /* async */ > + NULL, /* start_non_stop */ > + NULL, /* supports_multi_process */ > + NULL, /* handle_monitor_command */ > +}; > + > +void > +initialize_low (void) > +{ > + set_target_ops (&lynx_target_ops); > + the_low_target.arch_setup (); > +} > + > diff --git a/gdb/gdbserver/lynx-low.h b/gdb/gdbserver/lynx-low.h > new file mode 100644 > index 0000000..9f2ce30 > --- /dev/null > +++ b/gdb/gdbserver/lynx-low.h > @@ -0,0 +1,57 @@ > +/* Copyright (C) 2010 Free Software Foundation, Inc. > + > + This file is part of GDB. > + > + This program is free software; you can redistribute it and/or modify > + it under the terms of the GNU General Public License as published by > + the Free Software Foundation; either version 3 of the License, or > + (at your option) any later version. > + > + This program is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + GNU General Public License for more details. > + > + You should have received a copy of the GNU General Public License > + along with this program. If not, see <http://www.gnu.org/licenses/>. */ > + > +#include "server.h" > + > +struct regcache; > + > +/* Some information relative to a given register set. */ > + > +struct lynx_regset_info > +{ > + /* The ptrace request needed to get/set registers of this set. */ > + int get_request, set_request; > + /* The size of the register set. */ > + int size; > + /* Fill the buffer BUF from the contents of the given REGCACHE. */ > + void (*fill_function) (struct regcache *regcache, void *buf); > + /* Store the register value in BUF in the given REGCACHE. */ > + void (*store_function) (struct regcache *regcache, const void *buf); > +}; > + > +/* A list of regsets for the target being debugged, terminated by an entry > + where the size is negative. > + > + This list should be created by the target-specific code. */ > + > +extern struct lynx_regset_info lynx_target_regsets[]; > + > +/* The target-specific operations for LynxOS support. */ > + > +struct lynx_target_ops > +{ > + /* Architecture-specific setup. */ > + void (*arch_setup) (void); > +}; > + > +extern struct lynx_target_ops the_low_target; > + > +/* LynxOS-specific ptid handling. */ > + > +ptid_t lynx_ptid_build (int pid, long tid); > +int lynx_ptid_get_pid (ptid_t ptid); > +long lynx_ptid_get_tid (ptid_t ptid); > diff --git a/gdb/gdbserver/lynx-ppc-low.c b/gdb/gdbserver/lynx-ppc-low.c > new file mode 100644 > index 0000000..6002060 > --- /dev/null > +++ b/gdb/gdbserver/lynx-ppc-low.c > @@ -0,0 +1,186 @@ > +/* Copyright (C) 2009, 2010 Free Software Foundation, Inc. > + > + This file is part of GDB. > + > + This program is free software; you can redistribute it and/or modify > + it under the terms of the GNU General Public License as published by > + the Free Software Foundation; either version 3 of the License, or > + (at your option) any later version. > + > + This program is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + GNU General Public License for more details. > + > + You should have received a copy of the GNU General Public License > + along with this program. If not, see <http://www.gnu.org/licenses/>. */ > + > +#include "server.h" > +#include "lynx-low.h" > + > +#include <stdint.h> > +#include <stddef.h> > +#include <limits.h> > +#include <ptrace.h> > + > +/* The following two typedefs are defined in a .h file which is not > + in the standard include path (/sys/include/family/ppc/ucontext.h), > + so we just duplicate them here. */ > + > +/* General register context */ > +typedef struct usr_econtext_s > +{ > + uint32_t uec_iregs[32]; > + uint32_t uec_inum; > + uint32_t uec_srr0; > + uint32_t uec_srr1; > + uint32_t uec_lr; > + uint32_t uec_ctr; > + uint32_t uec_cr; > + uint32_t uec_xer; > + uint32_t uec_dar; > + uint32_t uec_mq; > + uint32_t uec_msr; > + uint32_t uec_sregs[16]; > + uint32_t uec_ss_count; > + uint32_t uec_ss_addr1; > + uint32_t uec_ss_addr2; > + uint32_t uec_ss_code1; > + uint32_t uec_ss_code2; > +} usr_econtext_t; > + > +/* Floating point register context */ > +typedef struct usr_fcontext_s > +{ > + uint64_t ufc_freg[32]; > + uint32_t ufc_fpscr[2]; > +} usr_fcontext_t; > + > +/* Index of for various registers inside the regcache. */ > +#define R0_REGNUM 0 > +#define F0_REGNUM 32 > +#define PC_REGNUM 64 > +#define MSR_REGNUM 65 > +#define CR_REGNUM 66 > +#define LR_REGNUM 67 > +#define CTR_REGNUM 68 > +#define XER_REGNUM 69 > +#define FPSCR_REGNUM 70 > + > +/* Defined in auto-generated file powerpc-32.c. */ > +extern void init_registers_powerpc_32 (void); > + > +/* The fill_function for the general-purpose register set. */ > + > +static void > +lynx_ppc_fill_gregset (struct regcache *regcache, void *buf) > +{ > + int i; > + > + /* r0 - r31 */ > + for (i = 0; i < 32; i++) > + collect_register (regcache, R0_REGNUM + i, > + buf + offsetof (usr_econtext_t, uec_iregs[i])); > + > + /* The other registers provided in the GP register context. */ > + collect_register (regcache, PC_REGNUM, > + buf + offsetof (usr_econtext_t, uec_srr0)); > + collect_register (regcache, MSR_REGNUM, > + buf + offsetof (usr_econtext_t, uec_srr1)); > + collect_register (regcache, CR_REGNUM, > + buf + offsetof (usr_econtext_t, uec_cr)); > + collect_register (regcache, LR_REGNUM, > + buf + offsetof (usr_econtext_t, uec_lr)); > + collect_register (regcache, CTR_REGNUM, > + buf + offsetof (usr_econtext_t, uec_ctr)); > + collect_register (regcache, XER_REGNUM, > + buf + offsetof (usr_econtext_t, uec_xer)); > +} > + > +/* The store_function for the general-purpose register set. */ > + > +static void > +lynx_ppc_store_gregset (struct regcache *regcache, const void *buf) > +{ > + int i; > + > + /* r0 - r31 */ > + for (i = 0; i < 32; i++) > + supply_register (regcache, R0_REGNUM + i, > + buf + offsetof (usr_econtext_t, uec_iregs[i])); > + > + /* The other registers provided in the GP register context. */ > + supply_register (regcache, PC_REGNUM, > + buf + offsetof (usr_econtext_t, uec_srr0)); > + supply_register (regcache, MSR_REGNUM, > + buf + offsetof (usr_econtext_t, uec_srr1)); > + supply_register (regcache, CR_REGNUM, > + buf + offsetof (usr_econtext_t, uec_cr)); > + supply_register (regcache, LR_REGNUM, > + buf + offsetof (usr_econtext_t, uec_lr)); > + supply_register (regcache, CTR_REGNUM, > + buf + offsetof (usr_econtext_t, uec_ctr)); > + supply_register (regcache, XER_REGNUM, > + buf + offsetof (usr_econtext_t, uec_xer)); > +} > + > +/* The fill_function for the floating-point register set. */ > + > +static void > +lynx_ppc_fill_fpregset (struct regcache *regcache, void *buf) > +{ > + int i; > + > + /* f0 - f31 */ > + for (i = 0; i < 32; i++) > + collect_register (regcache, F0_REGNUM + i, > + buf + offsetof (usr_fcontext_t, ufc_freg[i])); > + > + /* fpscr */ > + collect_register (regcache, FPSCR_REGNUM, > + buf + offsetof (usr_fcontext_t, ufc_fpscr)); > +} > + > +/* The store_function for the floating-point register set. */ > + > +static void > +lynx_ppc_store_fpregset (struct regcache *regcache, const void *buf) > +{ > + int i; > + > + /* f0 - f31 */ > + for (i = 0; i < 32; i++) > + supply_register (regcache, F0_REGNUM + i, > + buf + offsetof (usr_fcontext_t, ufc_freg[i])); > + > + /* fpscr */ > + supply_register (regcache, FPSCR_REGNUM, > + buf + offsetof (usr_fcontext_t, ufc_fpscr)); > +} > + > +/* Implements the lynx_target_ops.arch_setup routine. */ > + > +static void > +lynx_ppc_arch_setup (void) > +{ > + init_registers_powerpc_32 (); > +} > + > +/* Description of all the powerpc-lynx register sets. */ > + > +struct lynx_regset_info lynx_target_regsets[] = { > + /* General Purpose Registers. */ > + {PTRACE_GETREGS, PTRACE_SETREGS, sizeof(usr_econtext_t), > + lynx_ppc_fill_gregset, lynx_ppc_store_gregset}, > + /* Floating Point Registers. */ > + { PTRACE_GETFPREGS, PTRACE_SETFPREGS, sizeof(usr_fcontext_t), > + lynx_ppc_fill_fpregset, lynx_ppc_store_fpregset }, > + /* End of list marker. */ > + {0, 0, -1, NULL, NULL } > +}; > + > +/* The lynx_target_ops vector for powerpc-lynxos. */ > + > +struct lynx_target_ops the_low_target = { > + lynx_ppc_arch_setup, > +}; > diff --git a/gdb/gdbserver/lynx-ptrace.c b/gdb/gdbserver/lynx-ptrace.c > new file mode 100644 > index 0000000..9654cd6 > --- /dev/null > +++ b/gdb/gdbserver/lynx-ptrace.c > @@ -0,0 +1,262 @@ > +/* Copyright (C) 2010 Free Software Foundation, Inc. > + > + This file is part of GDB. > + > + This program is free software; you can redistribute it and/or modify > + it under the terms of the GNU General Public License as published by > + the Free Software Foundation; either version 3 of the License, or > + (at your option) any later version. > + > + This program is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + GNU General Public License for more details. > + > + You should have received a copy of the GNU General Public License > + along with this program. If not, see <http://www.gnu.org/licenses/>. */ > + > +#include "server.h" > +#include "lynx-ptrace.h" > + > +#include <limits.h> > +#include <ptrace.h> > +#include <sys/piddef.h> /* Provides PIDGET, TIDGET, BUILDPID, etc. */ > + > +static int > +lynx_ptrace_pid_from_ptid (ptid_t ptid) > +{ > + return BUILDPID (lynx_ptid_get_pid (ptid), lynx_ptid_get_tid (ptid)); > +} > + > +/* Return a string image of the ptrace REQUEST number. */ > + > +static char * > +ptrace_request_to_str (int request) > +{ > + switch (request) > + { > + case PTRACE_TRACEME: > + return "PTRACE_TRACEME"; > + break; > + case PTRACE_PEEKTEXT: > + return "PTRACE_PEEKTEXT"; > + break; > + case PTRACE_PEEKDATA: > + return "PTRACE_PEEKDATA"; > + break; > + case PTRACE_PEEKUSER: > + return "PTRACE_PEEKUSER"; > + break; > + case PTRACE_POKETEXT: > + return "PTRACE_POKETEXT"; > + break; > + case PTRACE_POKEDATA: > + return "PTRACE_POKEDATA"; > + break; > + case PTRACE_POKEUSER: > + return "PTRACE_POKEUSER"; > + break; > + case PTRACE_CONT: > + return "PTRACE_CONT"; > + break; > + case PTRACE_KILL: > + return "PTRACE_KILL"; > + break; > + case PTRACE_SINGLESTEP: > + return "PTRACE_SINGLESTEP"; > + break; > + case PTRACE_ATTACH: > + return "PTRACE_ATTACH"; > + break; > + case PTRACE_DETACH: > + return "PTRACE_DETACH"; > + break; > + case PTRACE_GETREGS: > + return "PTRACE_GETREGS"; > + break; > + case PTRACE_SETREGS: > + return "PTRACE_SETREGS"; > + break; > + case PTRACE_GETFPREGS: > + return "PTRACE_GETFPREGS"; > + break; > + case PTRACE_SETFPREGS: > + return "PTRACE_SETFPREGS"; > + break; > + case PTRACE_READDATA: > + return "PTRACE_READDATA"; > + break; > + case PTRACE_WRITEDATA: > + return "PTRACE_WRITEDATA"; > + break; > + case PTRACE_READTEXT: > + return "PTRACE_READTEXT"; > + break; > + case PTRACE_WRITETEXT: > + return "PTRACE_WRITETEXT"; > + break; > + case PTRACE_GETFPAREGS: > + return "PTRACE_GETFPAREGS"; > + break; > + case PTRACE_SETFPAREGS: > + return "PTRACE_SETFPAREGS"; > + break; > + case PTRACE_GETWINDOW: > + return "PTRACE_GETWINDOW"; > + break; > + case PTRACE_SETWINDOW: > + return "PTRACE_SETWINDOW"; > + break; > + case PTRACE_SYSCALL: > + return "PTRACE_SYSCALL"; > + break; > + case PTRACE_DUMPCORE: > + return "PTRACE_DUMPCORE"; > + break; > + case PTRACE_SETWRBKPT: > + return "PTRACE_SETWRBKPT"; > + break; > + case PTRACE_SETACBKPT: > + return "PTRACE_SETACBKPT"; > + break; > + case PTRACE_CLRBKPT: > + return "PTRACE_CLRBKPT"; > + break; > + case PTRACE_GET_UCODE: > + return "PTRACE_GET_UCODE"; > + break; > +#ifdef PT_READ_GPR > + case PT_READ_GPR: > + return "PT_READ_GPR"; > + break; > +#endif > +#ifdef PT_WRITE_GPR > + case PT_WRITE_GPR: > + return "PT_WRITE_GPR"; > + break; > +#endif > +#ifdef PT_READ_FPR > + case PT_READ_FPR: > + return "PT_READ_FPR"; > + break; > +#endif > +#ifdef PT_WRITE_FPR > + case PT_WRITE_FPR: > + return "PT_WRITE_FPR"; > + break; > +#endif > +#ifdef PTRACE_GETVECREGS > + case PTRACE_GETVECREGS: > + return "PTRACE_GETVECREGS"; > + break; > +#endif > +#ifdef PTRACE_SETVECREGS > + case PTRACE_SETVECREGS: > + return "PTRACE_SETVECREGS"; > + break; > +#endif > +#ifdef PT_READ_VPR > + case PT_READ_VPR: > + return "PT_READ_VPR"; > + break; > +#endif > +#ifdef PT_WRITE_VPR > + case PT_WRITE_VPR: > + return "PT_WRITE_VPR"; > + break; > +#endif > +#ifdef PTRACE_PEEKUSP > + case PTRACE_PEEKUSP: > + return "PTRACE_PEEKUSP"; > + break; > +#endif > +#ifdef PTRACE_POKEUSP > + case PTRACE_POKEUSP: > + return "PTRACE_POKEUSP"; > + break; > +#endif > + case PTRACE_PEEKTHREAD: > + return "PTRACE_PEEKTHREAD"; > + break; > + case PTRACE_THREADUSER: > + return "PTRACE_THREADUSER"; > + break; > + case PTRACE_FPREAD: > + return "PTRACE_FPREAD"; > + break; > + case PTRACE_FPWRITE: > + return "PTRACE_FPWRITE"; > + break; > + case PTRACE_SETSIG: > + return "PTRACE_SETSIG"; > + break; > + case PTRACE_CONT_ONE: > + return "PTRACE_CONT_ONE"; > + break; > + case PTRACE_KILL_ONE: > + return "PTRACE_KILL_ONE"; > + break; > + case PTRACE_SINGLESTEP_ONE: > + return "PTRACE_SINGLESTEP_ONE"; > + break; > + case PTRACE_GETLOADINFO: > + return "PTRACE_GETLOADINFO"; > + break; > + case PTRACE_GETTHREADLIST: > + return "PTRACE_GETTHREADLIST"; > + break; > + case PTRACE_POSTSYSCALL: > + return "PTRACE_POSTSYSCALL"; > + break; > + case PTRACE_USE_SIGEXECED: > + return "PTRACE_USE_SIGEXECED"; > + break; > + case PTRACE_GETTRACESIG: > + return "PTRACE_GETTRACESIG"; > + break; > + case PTRACE_GETCWD: > + return "PTRACE_GETCWD"; > + break; > + case PTRACE_TRAPFORK: > + return "PTRACE_TRAPFORK"; > + break; > + case PTRACE_GETCHILDPID: > + return "PTRACE_GETCHILDPID"; > + break; > + case PTRACE_SYSCALL_ONE: > + return "PTRACE_SYSCALL_ONE"; > + break; > + case PTRACE_SIGMASK: > + return "PTRACE_SIGMASK"; > + break; > + case PTRACE_GETIWD: > + return "PTRACE_GETIWD"; > + break; > + case PTRACE_GETEXECFILE: > + return "PTRACE_GETEXECFILE"; > + break; > + } > + return "<unknown-request>"; > +} > + > +/* A wrapper around ptrace that allows us to print debug traces of > + ptrace calls if debug traces are activated. */ > + > +int > +lynx_ptrace (int request, ptid_t ptid, int addr, int data, int addr2) > +{ > + int result; > + const int pid = lynx_ptrace_pid_from_ptid (ptid); > + > + if (debug_threads) > + printf ("PTRACE (%s, pid=%d(pid=%d, tid=%d), addr=0x%x, data=0x%x, " > + "addr2=0x%x)", > + ptrace_request_to_str (request), pid, PIDGET (pid), TIDGET (pid), > + addr, data, addr2); > + result = ptrace (request, pid, addr, data, addr2); > + if (debug_threads) > + printf (" -> %d (=0x%x)\n", result, result); > + > + return result; > +} > + > diff --git a/gdb/gdbserver/lynx-ptrace.h b/gdb/gdbserver/lynx-ptrace.h > new file mode 100644 > index 0000000..dc39550 > --- /dev/null > +++ b/gdb/gdbserver/lynx-ptrace.h > @@ -0,0 +1,26 @@ > +/* Copyright (C) 2010 Free Software Foundation, Inc. > + > + This file is part of GDB. > + > + This program is free software; you can redistribute it and/or modify > + it under the terms of the GNU General Public License as published by > + the Free Software Foundation; either version 3 of the License, or > + (at your option) any later version. > + > + This program is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + GNU General Public License for more details. > + > + You should have received a copy of the GNU General Public License > + along with this program. If not, see <http://www.gnu.org/licenses/>. */ > + > +#ifndef LYNX_PTRACE_H > +#define LYNX_PTRACE_H > + > +#include "server.h" > + > +int lynx_ptrace (int request, ptid_t ptid, int addr, int data, int addr2); > + > +#endif > + > -- > 1.7.0.4 ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [RFA 3/3] gdbserver support for powerpc-lynxos (4.x) 2010-07-27 16:13 ` Pedro Alves @ 2010-08-31 19:38 ` Joel Brobecker 2010-08-31 20:24 ` Pedro Alves 0 siblings, 1 reply; 13+ messages in thread From: Joel Brobecker @ 2010-08-31 19:38 UTC (permalink / raw) To: Pedro Alves; +Cc: gdb-patches [-- Attachment #1: Type: text/plain, Size: 2047 bytes --] > Hi Joel. Sorry for how long it took to get to this... No problem - it must have taken me just as long to answer... I followed all your suggestions. I'm still a little unsure about: > Make sure you don't need to handle EINTR here. You may want to take > a look at linux-low.c:my_waitpid and see whether you could do something > of the sorts, to be able to get rid of the usleep. I was going to say that I haven't faced a situation where I received an EINTR, but I looked at the man page, and indeed, they mention it explicitly. I wonder if I could just copy/paste the implementation for Linux with support for clone removed.... I will do that next, but I suggest that we treat this as a separate patch? That way, we can get the bulk out of the way, and focus on enhancing that part of the patch only. > > + if (status->kind == TARGET_WAITKIND_STOPPED > > + && status->value.integer == SIGTRAP) > > `enum target_signal' vs host signal mixup continued. Can you spot me on this? I made the changes that I think needed to be made, but can you verify that I made the right ones? I also made a change to the patch that imports vasprintf: I added a -DHAVE_CONFIG_H to the compile command, to avoid 'function implicitly defined' gcc warnings. The file looks like this: #ifdef HAVE_CONFIG_H #include "config.h" #endif [...] #ifdef HAVE_STRING_H #include <string.h> #endif I added the define to build this file with gdbserver's config.h, so that system headers whose inclusion is conditionalized get included when appropriate. The modified hunk is: +# We build vasprintf with -DHAVE_CONFIG_H because we want that unit to +# include our config.h file. Otherwise, some system headers do not get +# included, and the compiler emits a warning about implicitly defined +# functions (missing declaration). +vasprintf.o: $(srcdir)/../../libiberty/vasprintf.c + $(CC) -o vasprintf.o -c $(CPPFLAGS) $(INTERNAL_CFLAGS) -DHAVE_CONFIG_H $< Tested on lynxos 4.0. Does this look OK? -- Joel [-- Attachment #2: lynxos-vasprintf.diff --] [-- Type: text/x-diff, Size: 3802 bytes --] commit bc504af4c6fb9545554cd5df68b274b3a2a2dd2b Author: Joel Brobecker <brobecker@adacore.com> Date: Tue Dec 1 23:10:58 2009 -0500 Import vsnprintf from libiberty if not available. vasprintf and vsnprintf are not available on LynxOS, at least not on version 4.0.0. This patch updates the configury to import them from libiberty if not available out of the box. gdbserver/ * Makefile.in (vasprintf.o, vsnprintf.o): New rules. * configure.ac: Add check for vasprintf and vsnprintf. * configure, config.in: Regenerate. * server.h (vasprintf, vsnprintf): Add conditional declarations. diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 30593ef..8d5d04b 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -355,6 +355,15 @@ signals.o: ../common/signals.c $(server_h) $(signals_def) memmem.o: ../gnulib/memmem.c $(CC) -o memmem.o -c $(CPPFLAGS) $(INTERNAL_CFLAGS) -Wno-error $< +# We build vasprintf with -DHAVE_CONFIG_H because we want that unit to +# include our config.h file. Otherwise, some system headers do not get +# included, and the compiler emits a warning about implicitly defined +# functions (missing declaration). +vasprintf.o: $(srcdir)/../../libiberty/vasprintf.c + $(CC) -o vasprintf.o -c $(CPPFLAGS) $(INTERNAL_CFLAGS) -DHAVE_CONFIG_H $< +vsnprintf.o: $(srcdir)/../../libiberty/vsnprintf.c + $(CC) -o vsnprintf.o -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< + i386_low_h = $(srcdir)/i386-low.h i386-low.o: i386-low.c $(i386_low_h) $(server_h) $(target_h) diff --git a/gdb/gdbserver/config.in b/gdb/gdbserver/config.in index a6a9704..909dcb9 100644 --- a/gdb/gdbserver/config.in +++ b/gdb/gdbserver/config.in @@ -30,6 +30,14 @@ don't. */ #undef HAVE_DECL_STRERROR +/* Define to 1 if you have the declaration of `vasprintf', and to 0 if you + don't. */ +#undef HAVE_DECL_VASPRINTF + +/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you + don't. */ +#undef HAVE_DECL_VSNPRINTF + /* Define to 1 if you have the `dladdr' function. */ #undef HAVE_DLADDR @@ -172,6 +180,12 @@ /* Define if UST is available */ #undef HAVE_UST +/* Define to 1 if you have the `vasprintf' function. */ +#undef HAVE_VASPRINTF + +/* Define to 1 if you have the `vsnprintf' function. */ +#undef HAVE_VSNPRINTF + /* Checking if errno must be defined */ #undef MUST_DEFINE_ERRNO diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac index bc3bb11..c61ab54 100644 --- a/gdb/gdbserver/configure.ac +++ b/gdb/gdbserver/configure.ac @@ -44,7 +44,7 @@ AC_CHECK_HEADERS(sgtty.h termio.h termios.h sys/reg.h string.h dnl sys/ioctl.h netinet/in.h sys/socket.h netdb.h dnl netinet/tcp.h arpa/inet.h sys/wait.h) AC_CHECK_FUNCS(pread pwrite pread64) -AC_REPLACE_FUNCS(memmem) +AC_REPLACE_FUNCS(memmem vasprintf vsnprintf) # Check for UST ustlibs="" @@ -161,7 +161,7 @@ AC_TRY_LINK([ [AC_MSG_RESULT(no)]) fi -AC_CHECK_DECLS([strerror, perror, memmem]) +AC_CHECK_DECLS([strerror, perror, memmem, vasprintf, vsnprintf]) AC_CHECK_TYPES(socklen_t, [], [], [#include <sys/types.h> diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index 286c80a..2e727f4 100644 --- a/gdb/gdbserver/server.h +++ b/gdb/gdbserver/server.h @@ -58,6 +58,13 @@ extern void perror (const char *); extern void *memmem (const void *, size_t , const void *, size_t); #endif +#if !HAVE_DECL_VASPRINTF +extern int vasprintf(char **strp, const char *fmt, va_list ap); +#endif +#if !HAVE_DECL_VSNPRINTF +int vsnprintf(char *str, size_t size, const char *format, va_list ap); +#endif + #ifndef ATTR_NORETURN #if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)) #define ATTR_NORETURN __attribute__ ((noreturn)) [-- Attachment #3: lynxos-gdbserver.diff --] [-- Type: text/x-diff, Size: 33191 bytes --] commit 8c4ef4e08c10f53b39400b026200acd542d962d7 Author: Joel Brobecker <brobecker@adacore.com> Date: Tue Dec 1 23:20:56 2009 -0500 gdbserver support for powerpc-lynxos (4.x) This patch adds support for powerpc-lynxos. Note that I'm adding a new varialble "srv_extra_libs" in configure.srv. I need this because I need to link against -linet. Perhaps the right way of doing things might have been to use a configure check... gdbserver/ChangeLog: * gdbserver/lynx-low.c, gdbserver/lynx-low.h, gdbserver/lynx-ppc-low.c: New files. * Makefile.in (lynx_low_h): New variable. (lynx-low.o, lynx-ppc-low.o): New rules. * configure.ac: On LynxOS, link with -lnetinet. * configure.srv: Add handling of powerpc-*-lynxos* targets. * configure: regenerate. diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 8d5d04b..6815350 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -301,6 +301,8 @@ server_h = $(srcdir)/server.h $(regcache_h) config.h $(srcdir)/target.h \ linux_low_h = $(srcdir)/linux-low.h +lynx_low_h = $(srcdir)/lynx-low.h $(srcdir)/server.h + nto_low_h = $(srcdir)/nto-low.h UST_CFLAGS = $(ustinc) -DCONFIG_UST_GDB_INTEGRATION @@ -388,6 +390,8 @@ linux-x86-low.o: linux-x86-low.c $(linux_low_h) $(server_h) \ $(gdb_proc_service_h) $(i386_low_h) linux-xtensa-low.o: linux-xtensa-low.c xtensa-xtregs.c $(linux_low_h) $(server_h) +lynx-low.o: lynx-low.c $(server_h) $(target_h) $(lynx_low_h) +lynx-ppc-low.o: lynx-ppc-low.c $(server_h) $(lynx_low_h) nto-low.o: nto-low.c $(server_h) $(nto_low_h) nto-x86-low.o: nto-x86-low.c $(server_h) $(nto_low_h) $(regdef_h) $(regcache_h) diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index 957cbc8..556cbb3 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -4439,6 +4439,8 @@ elif test "${srv_mingw}" = "yes"; then LIBS="$LIBS -lws2_32" elif test "${srv_qnx}" = "yes"; then LIBS="$LIBS -lsocket" +elif test "${srv_lynxos}" = "yes"; then + LIBS="$LIBS -lnetinet" fi if test "${srv_mingw}" = "yes"; then diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac index c61ab54..85b1a7b 100644 --- a/gdb/gdbserver/configure.ac +++ b/gdb/gdbserver/configure.ac @@ -212,6 +212,8 @@ elif test "${srv_mingw}" = "yes"; then LIBS="$LIBS -lws2_32" elif test "${srv_qnx}" = "yes"; then LIBS="$LIBS -lsocket" +elif test "${srv_lynxos}" = "yes"; then + LIBS="$LIBS -lnetinet" fi if test "${srv_mingw}" = "yes"; then diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv index 99187a5..8a14759 100644 --- a/gdb/gdbserver/configure.srv +++ b/gdb/gdbserver/configure.srv @@ -200,6 +200,10 @@ case "${target}" in srv_linux_regsets=yes srv_linux_thread_db=yes ;; + powerpc-*-lynxos*) srv_regobj="powerpc-32.o" + srv_tgtobj="lynx-low.o lynx-ppc-low.o" + srv_lynxos=yes + ;; s390*-*-linux*) srv_regobj="s390-linux32.o" srv_regobj="${srv_regobj} s390-linux64.o" srv_regobj="${srv_regobj} s390x-linux64.o" diff --git a/gdb/gdbserver/lynx-low.c b/gdb/gdbserver/lynx-low.c new file mode 100644 index 0000000..dba26d0 --- /dev/null +++ b/gdb/gdbserver/lynx-low.c @@ -0,0 +1,795 @@ +/* Copyright (C) 2009, 2010 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include "server.h" +#include "target.h" +#include "lynx-low.h" + +#include <limits.h> +#include <ptrace.h> +#include <sys/piddef.h> /* Provides PIDGET, TIDGET, BUILDPID, etc. */ +#include <unistd.h> +#include <sys/ioctl.h> +#include <sys/types.h> +#include <sys/wait.h> +#include <signal.h> + +int using_threads = 1; + +/* Print a debug trace on standard output if debug_threads is set. */ + +static void +lynx_debug (char *string, ...) +{ + va_list args; + + if (!debug_threads) + return; + + va_start (args, string); + fprintf (stdout, "DEBUG(lynx): "); + vfprintf (stdout, string, args); + fprintf (stdout, "\n"); + va_end (args); +} + +/* Build a ptid_t given a PID and a LynxOS TID. */ + +static ptid_t +lynx_ptid_build (int pid, long tid) +{ + /* brobecker/2010-06-21: It looks like the LWP field in ptids + should be distinct for each thread (see write_ptid where it + writes the thread ID from the LWP). So instead of storing + the LynxOS tid in the tid field of the ptid, we store it in + the lwp field. */ + return ptid_build (pid, tid, 0); +} + +/* Return the process ID of the given PTID. + + This function has little reason to exist, it's just a wrapper around + ptid_get_pid. But since we have a getter function for the lynxos + ptid, it feels cleaner to have a getter for the pid as well. */ + +static int +lynx_ptid_get_pid (ptid_t ptid) +{ + return ptid_get_pid (ptid); +} + +/* Return the LynxOS tid of the given PTID. */ + +static long +lynx_ptid_get_tid (ptid_t ptid) +{ + /* See lynx_ptid_build: The LynxOS tid is stored inside the lwp field + of the ptid. */ + return ptid_get_lwp (ptid); +} + +/* For a given PTID, return the associated PID as known by the LynxOS + ptrace layer. */ + +static int +lynx_ptrace_pid_from_ptid (ptid_t ptid) +{ + return BUILDPID (lynx_ptid_get_pid (ptid), lynx_ptid_get_tid (ptid)); +} + +/* Return a string image of the ptrace REQUEST number. */ + +static char * +ptrace_request_to_str (int request) +{ + switch (request) + { + case PTRACE_TRACEME: + return "PTRACE_TRACEME"; + break; + case PTRACE_PEEKTEXT: + return "PTRACE_PEEKTEXT"; + break; + case PTRACE_PEEKDATA: + return "PTRACE_PEEKDATA"; + break; + case PTRACE_PEEKUSER: + return "PTRACE_PEEKUSER"; + break; + case PTRACE_POKETEXT: + return "PTRACE_POKETEXT"; + break; + case PTRACE_POKEDATA: + return "PTRACE_POKEDATA"; + break; + case PTRACE_POKEUSER: + return "PTRACE_POKEUSER"; + break; + case PTRACE_CONT: + return "PTRACE_CONT"; + break; + case PTRACE_KILL: + return "PTRACE_KILL"; + break; + case PTRACE_SINGLESTEP: + return "PTRACE_SINGLESTEP"; + break; + case PTRACE_ATTACH: + return "PTRACE_ATTACH"; + break; + case PTRACE_DETACH: + return "PTRACE_DETACH"; + break; + case PTRACE_GETREGS: + return "PTRACE_GETREGS"; + break; + case PTRACE_SETREGS: + return "PTRACE_SETREGS"; + break; + case PTRACE_GETFPREGS: + return "PTRACE_GETFPREGS"; + break; + case PTRACE_SETFPREGS: + return "PTRACE_SETFPREGS"; + break; + case PTRACE_READDATA: + return "PTRACE_READDATA"; + break; + case PTRACE_WRITEDATA: + return "PTRACE_WRITEDATA"; + break; + case PTRACE_READTEXT: + return "PTRACE_READTEXT"; + break; + case PTRACE_WRITETEXT: + return "PTRACE_WRITETEXT"; + break; + case PTRACE_GETFPAREGS: + return "PTRACE_GETFPAREGS"; + break; + case PTRACE_SETFPAREGS: + return "PTRACE_SETFPAREGS"; + break; + case PTRACE_GETWINDOW: + return "PTRACE_GETWINDOW"; + break; + case PTRACE_SETWINDOW: + return "PTRACE_SETWINDOW"; + break; + case PTRACE_SYSCALL: + return "PTRACE_SYSCALL"; + break; + case PTRACE_DUMPCORE: + return "PTRACE_DUMPCORE"; + break; + case PTRACE_SETWRBKPT: + return "PTRACE_SETWRBKPT"; + break; + case PTRACE_SETACBKPT: + return "PTRACE_SETACBKPT"; + break; + case PTRACE_CLRBKPT: + return "PTRACE_CLRBKPT"; + break; + case PTRACE_GET_UCODE: + return "PTRACE_GET_UCODE"; + break; +#ifdef PT_READ_GPR + case PT_READ_GPR: + return "PT_READ_GPR"; + break; +#endif +#ifdef PT_WRITE_GPR + case PT_WRITE_GPR: + return "PT_WRITE_GPR"; + break; +#endif +#ifdef PT_READ_FPR + case PT_READ_FPR: + return "PT_READ_FPR"; + break; +#endif +#ifdef PT_WRITE_FPR + case PT_WRITE_FPR: + return "PT_WRITE_FPR"; + break; +#endif +#ifdef PTRACE_GETVECREGS + case PTRACE_GETVECREGS: + return "PTRACE_GETVECREGS"; + break; +#endif +#ifdef PTRACE_SETVECREGS + case PTRACE_SETVECREGS: + return "PTRACE_SETVECREGS"; + break; +#endif +#ifdef PT_READ_VPR + case PT_READ_VPR: + return "PT_READ_VPR"; + break; +#endif +#ifdef PT_WRITE_VPR + case PT_WRITE_VPR: + return "PT_WRITE_VPR"; + break; +#endif +#ifdef PTRACE_PEEKUSP + case PTRACE_PEEKUSP: + return "PTRACE_PEEKUSP"; + break; +#endif +#ifdef PTRACE_POKEUSP + case PTRACE_POKEUSP: + return "PTRACE_POKEUSP"; + break; +#endif + case PTRACE_PEEKTHREAD: + return "PTRACE_PEEKTHREAD"; + break; + case PTRACE_THREADUSER: + return "PTRACE_THREADUSER"; + break; + case PTRACE_FPREAD: + return "PTRACE_FPREAD"; + break; + case PTRACE_FPWRITE: + return "PTRACE_FPWRITE"; + break; + case PTRACE_SETSIG: + return "PTRACE_SETSIG"; + break; + case PTRACE_CONT_ONE: + return "PTRACE_CONT_ONE"; + break; + case PTRACE_KILL_ONE: + return "PTRACE_KILL_ONE"; + break; + case PTRACE_SINGLESTEP_ONE: + return "PTRACE_SINGLESTEP_ONE"; + break; + case PTRACE_GETLOADINFO: + return "PTRACE_GETLOADINFO"; + break; + case PTRACE_GETTHREADLIST: + return "PTRACE_GETTHREADLIST"; + break; + case PTRACE_POSTSYSCALL: + return "PTRACE_POSTSYSCALL"; + break; + case PTRACE_USE_SIGEXECED: + return "PTRACE_USE_SIGEXECED"; + break; + case PTRACE_GETTRACESIG: + return "PTRACE_GETTRACESIG"; + break; + case PTRACE_GETCWD: + return "PTRACE_GETCWD"; + break; + case PTRACE_TRAPFORK: + return "PTRACE_TRAPFORK"; + break; + case PTRACE_GETCHILDPID: + return "PTRACE_GETCHILDPID"; + break; + case PTRACE_SYSCALL_ONE: + return "PTRACE_SYSCALL_ONE"; + break; + case PTRACE_SIGMASK: + return "PTRACE_SIGMASK"; + break; + case PTRACE_GETIWD: + return "PTRACE_GETIWD"; + break; + case PTRACE_GETEXECFILE: + return "PTRACE_GETEXECFILE"; + break; + } + return "<unknown-request>"; +} + +/* A wrapper around ptrace that allows us to print debug traces of + ptrace calls if debug traces are activated. */ + +static int +lynx_ptrace (int request, ptid_t ptid, int addr, int data, int addr2) +{ + int result; + const int pid = lynx_ptrace_pid_from_ptid (ptid); + + if (debug_threads) + printf ("PTRACE (%s, pid=%d(pid=%d, tid=%d), addr=0x%x, data=0x%x, " + "addr2=0x%x)", + ptrace_request_to_str (request), pid, PIDGET (pid), TIDGET (pid), + addr, data, addr2); + result = ptrace (request, pid, addr, data, addr2); + if (debug_threads) + printf (" -> %d (=0x%x)\n", result, result); + + return result; +} + +/* Implement the create_inferior method of the target_ops vector. */ + +static int +lynx_create_inferior (char *program, char **allargs) +{ + struct process_info *new_process; + int pid; + + lynx_debug ("lynx_create_inferior ()"); + + pid = fork (); + if (pid < 0) + perror_with_name ("fork"); + + if (pid == 0) + { + int pgrp; + + /* Switch child to its own process group so that signals won't + directly affect gdbserver. */ + pgrp = getpid(); + setpgid (0, pgrp); + ioctl (0, TIOCSPGRP, &pgrp); + lynx_ptrace (PTRACE_TRACEME, null_ptid, 0, 0, 0); + execv (program, allargs); + fprintf (stderr, "Cannot exec %s: %s.\n", program, strerror (errno)); + fflush (stderr); + _exit (0177); + } + + new_process = add_process (pid, 0); + /* Do not add the process thread just yet, as we do not know its tid. + We will add it later, during the wait for the STOP event corresponding + to the lynx_ptrace (PTRACE_TRACEME) call above. */ + return pid; +} + +/* Implement the attach target_ops method. */ + +static int +lynx_attach (unsigned long pid) +{ + struct process_info *new_process; + ptid_t ptid = lynx_ptid_build (pid, 0); + + if (lynx_ptrace (PTRACE_ATTACH, ptid, 0, 0, 0) != 0) + error ("Cannot attach to process %lu: %s (%d)\n", pid, + strerror (errno), errno); + + new_process = add_process (pid, 1); + add_thread (ptid, NULL); + + return 0; +} + +/* Implement the resume target_ops method. */ + +static void +lynx_resume (struct thread_resume *resume_info, size_t n) +{ + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); + /* FIXME: Assume for now that n == 1. */ + const int request = (resume_info[0].kind == resume_step + ? PTRACE_SINGLESTEP : PTRACE_CONT); + const int signal = resume_info[0].sig; + int ret; + + regcache_invalidate (); + ret = lynx_ptrace (request, inferior_ptid, 1, signal, 0); +} + +/* Resume the execution of the given PTID. */ + +static void +lynx_continue (ptid_t ptid) +{ + struct thread_resume resume_info; + + resume_info.thread = ptid; + resume_info.kind = resume_continue; + resume_info.sig = 0; + + lynx_resume (&resume_info, 1); +} + +/* Remove all inferiors and associated threads. */ + +static void +lynx_clear_inferiors (void) +{ + /* We do not use private data, so nothing much to do except calling + clear_inferiors. */ + clear_inferiors (); +} + +/* A wrapper around waitpid that handles the various idiosyncrasies + of LynxOS' waitpid. */ + +static int +lynx_waitpid (int pid, int *stat_loc) +{ + int ret = 0; + + while (1) + { + ret = waitpid (pid, stat_loc, WNOHANG); + if (ret < 0) + { + /* An ECHILD error is not indicative of a real problem. + It happens for instance while waiting for the inferior + to stop after attaching to it. */ + if (errno != ECHILD) + perror_with_name ("waitpid (WNOHANG)"); + } + if (ret > 0) + break; + /* No event with WNOHANG. See if there is one with WUNTRACED. */ + ret = waitpid (pid, stat_loc, WNOHANG | WUNTRACED); + if (ret < 0) + { + /* An ECHILD error is not indicative of a real problem. + It happens for instance while waiting for the inferior + to stop after attaching to it. */ + if (errno != ECHILD) + perror_with_name ("waitpid (WNOHANG|WUNTRACED)"); + } + if (ret > 0) + break; + usleep (1000); + } + return ret; +} + +/* Implement the wait target_ops method. */ + +static ptid_t +lynx_wait_1 (ptid_t ptid, struct target_waitstatus *status, int options) +{ + int pid; + int ret; + int wstat; + ptid_t new_ptid; + + if (ptid_equal (ptid, minus_one_ptid)) + pid = lynx_ptid_get_pid (thread_to_gdb_id (current_inferior)); + else + pid = BUILDPID (lynx_ptid_get_pid (ptid), lynx_ptid_get_tid (ptid)); + +retry: + + ret = lynx_waitpid (pid, &wstat); + new_ptid = lynx_ptid_build (ret, ((union wait *) &wstat)->w_tid); + + /* If this is a new thread, then add it now. The reason why we do + this here instead of when handling new-thread events is because + we need to add the thread associated to the "main" thread - even + for non-threaded applications where the new-thread events are not + generated. */ + if (!find_thread_ptid (new_ptid)) + add_thread (new_ptid, NULL); + + if (WIFSTOPPED (wstat)) + { + status->kind = TARGET_WAITKIND_STOPPED; + status->value.integer = target_signal_from_host (WSTOPSIG (wstat)); + lynx_debug ("process stopped with signal: %d", + status->value.integer); + } + else if (WIFEXITED (wstat)) + { + status->kind = TARGET_WAITKIND_EXITED; + status->value.integer = target_signal_from_host (WEXITSTATUS (wstat)); + lynx_debug ("process exited with code: %d", status->value.integer); + } + else if (WIFSIGNALED (wstat)) + { + status->kind = TARGET_WAITKIND_SIGNALLED; + status->value.integer = target_signal_from_host (WTERMSIG (wstat)); + lynx_debug ("process terminated with code: %d", + status->value.integer); + } + else + { + /* Not sure what happened if we get here, or whether we can + in fact get here. But if we do, handle the event the best + we can. */ + status->kind = TARGET_WAITKIND_STOPPED; + status->value.integer = target_signal_from_host (0); + lynx_debug ("unknown event ????"); + } + + /* SIGTRAP events are generated for situations other than single-step/ + breakpoint events (Eg. new-thread events). Handle those other types + of events, and resume the execution if necessary. */ + if (status->kind == TARGET_WAITKIND_STOPPED + && status->value.integer == target_signal_from_host (SIGTRAP)) + { + const int realsig = lynx_ptrace (PTRACE_GETTRACESIG, new_ptid, 0, 0, 0); + + lynx_debug ("(realsig = %d)", realsig); + switch (realsig) + { + case SIGNEWTHREAD: + /* We just added the new thread above. No need to do anything + further. Just resume the execution again. */ + lynx_continue (ptid); + goto retry; + + case SIGTHREADEXIT: + remove_thread (find_thread_ptid (new_ptid)); + lynx_continue (ptid); + goto retry; + } + } + + return new_ptid; +} + +/* A wrapper around lynx_wait_1 that also prints debug traces when + such debug traces have been activated. */ + +static ptid_t +lynx_wait (ptid_t ptid, struct target_waitstatus *status, int options) +{ + ptid_t new_ptid; + + lynx_debug ("lynx_wait (pid = %d, tid = %ld)", + lynx_ptid_get_pid (ptid), lynx_ptid_get_tid (ptid)); + new_ptid = lynx_wait_1 (ptid, status, options); + lynx_debug (" -> (pid=%d, tid=%ld, status->kind = %d)", + lynx_ptid_get_pid (new_ptid), lynx_ptid_get_tid (new_ptid), + status->kind); + return new_ptid; +} + +/* Implement the kill target_ops method. */ + +static int +lynx_kill (int pid) +{ + ptid_t ptid = lynx_ptid_build (pid, 0); + struct target_waitstatus status; + + lynx_ptrace (PTRACE_KILL, ptid, 0, 0, 0); + lynx_wait (ptid, &status, 0); + return 0; +} + +/* Implement the detach target_ops method. */ + +static int +lynx_detach (int pid) +{ + ptid_t ptid = lynx_ptid_build (pid, 0); + + lynx_ptrace (PTRACE_DETACH, ptid, 0, 0, 0); + return 0; +} + +/* Implement the mourn target_ops method. */ + +static void +lynx_mourn (struct process_info *proc) +{ + lynx_clear_inferiors (); +} + +/* Implement the join target_ops method. */ + +static void +lynx_join (int pid) +{ + /* The PTRACE_DETACH is sufficient to detach from the process. + So no need to do anything extra. */ +} + +/* Implement the thread_alive target_ops method. */ + +static int +lynx_thread_alive (ptid_t ptid) +{ + /* The list of threads is updated at the end of each wait, so it + should be up to date. No need to re-fetch it. */ + return (find_thread_ptid (ptid) != NULL); +} + +/* Implement the fetch_registers target_ops method. */ + +static void +lynx_fetch_registers (struct regcache *regcache, int regno) +{ + struct lynx_regset_info *regset = lynx_target_regsets; + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); + + lynx_debug ("lynx_fetch_registers (regno = %d)", regno); + + while (regset->size >= 0) + { + char *buf; + int res; + + buf = xmalloc (regset->size); + res = lynx_ptrace (regset->get_request, inferior_ptid, (int) buf, 0, 0); + if (res < 0) + perror ("ptrace"); + regset->store_function (regcache, buf); + free (buf); + regset++; + } +} + +/* Implement the store_registers target_ops method. */ + +static void +lynx_store_registers (struct regcache *regcache, int regno) +{ + struct lynx_regset_info *regset = lynx_target_regsets; + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); + + lynx_debug ("lynx_store_registers (regno = %d)", regno); + + while (regset->size >= 0) + { + char *buf; + int res; + + buf = xmalloc (regset->size); + res = lynx_ptrace (regset->get_request, inferior_ptid, (int) buf, 0, 0); + if (res == 0) + { + /* Then overlay our cached registers on that. */ + regset->fill_function (regcache, buf); + /* Only now do we write the register set. */ + res = lynx_ptrace (regset->set_request, inferior_ptid, (int) buf, + 0, 0); + } + if (res < 0) + perror ("ptrace"); + free (buf); + regset++; + } +} + +/* Implement the read_memory target_ops method. */ + +static int +lynx_read_memory (CORE_ADDR memaddr, unsigned char *myaddr, int len) +{ + /* On LynxOS, memory reads needs to be performed in chunks the size + of int types, and they should also be aligned accordingly. */ + int buf; + const int xfer_size = sizeof (buf); + CORE_ADDR addr = memaddr & -(CORE_ADDR)xfer_size; + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); + + while (addr < memaddr + len) + { + int skip = 0; + int truncate = 0; + + errno = 0; + if (addr < memaddr) + skip = memaddr - addr; + if (addr + xfer_size > memaddr + len) + truncate = addr + xfer_size - memaddr - len; + buf = lynx_ptrace (PTRACE_PEEKTEXT, inferior_ptid, addr, 0, 0); + if (errno) + return errno; + memcpy (myaddr + (addr - memaddr) + skip, (gdb_byte *)&buf + skip, + xfer_size - skip - truncate); + addr += xfer_size; + } + + return 0; +} + +/* Implement the write_memory target_ops method. */ + +static int +lynx_write_memory (CORE_ADDR memaddr, const unsigned char *myaddr, int len) +{ + /* On LynxOS, memory writes needs to be performed in chunks the size + of int types, and they should also be aligned accordingly. */ + int buf; + const int xfer_size = sizeof (buf); + CORE_ADDR addr = memaddr & -(CORE_ADDR)xfer_size; + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); + + while (addr < memaddr + len) + { + int skip = 0; + int truncate = 0; + + if (addr < memaddr) + skip = memaddr - addr; + if (addr + xfer_size > memaddr + len) + truncate = addr + xfer_size - memaddr - len; + if (skip > 0 || truncate > 0) + /* We need to read the memory at this address in order to preserve + the data that we are not overwriting. */ + lynx_read_memory (addr, (unsigned char *) &buf, xfer_size); + if (errno) + return errno; + memcpy ((gdb_byte *) &buf + skip, myaddr + (addr - memaddr) + skip, + xfer_size - skip - truncate); + errno = 0; + lynx_ptrace (PTRACE_POKETEXT, inferior_ptid, addr, buf, 0); + if (errno) + return errno; + addr += xfer_size; + } + + return 0; +} + +/* Implement the kill_request target_ops method. */ + +static void +lynx_request_interrupt (void) +{ + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); + + kill (lynx_ptid_get_pid (inferior_ptid), SIGINT); +} + +/* The LynxOS target_ops vector. */ + +static struct target_ops lynx_target_ops = { + lynx_create_inferior, + lynx_attach, + lynx_kill, + lynx_detach, + lynx_mourn, + lynx_join, + lynx_thread_alive, + lynx_resume, + lynx_wait, + lynx_fetch_registers, + lynx_store_registers, + NULL, /* prepare_to_access_memory */ + NULL, /* done_accessing_memory */ + lynx_read_memory, + lynx_write_memory, + NULL, /* look_up_symbols */ + lynx_request_interrupt, + NULL, /* read_auxv */ + NULL, /* insert_point */ + NULL, /* remove_point */ + NULL, /* stopped_by_watchpoint */ + NULL, /* stopped_data_address */ + NULL, /* read_offsets */ + NULL, /* get_tls_address */ + NULL, /* qxfer_spu */ + NULL, /* hostio_last_error */ + NULL, /* qxfer_osdata */ + NULL, /* qxfer_siginfo */ + NULL, /* supports_non_stop */ + NULL, /* async */ + NULL, /* start_non_stop */ + NULL, /* supports_multi_process */ + NULL, /* handle_monitor_command */ +}; + +void +initialize_low (void) +{ + set_target_ops (&lynx_target_ops); + the_low_target.arch_setup (); +} + diff --git a/gdb/gdbserver/lynx-low.h b/gdb/gdbserver/lynx-low.h new file mode 100644 index 0000000..1e004bf --- /dev/null +++ b/gdb/gdbserver/lynx-low.h @@ -0,0 +1,52 @@ +/* Copyright (C) 2010 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include "server.h" + +struct regcache; + +/* Some information relative to a given register set. */ + +struct lynx_regset_info +{ + /* The ptrace request needed to get/set registers of this set. */ + int get_request, set_request; + /* The size of the register set. */ + int size; + /* Fill the buffer BUF from the contents of the given REGCACHE. */ + void (*fill_function) (struct regcache *regcache, char *buf); + /* Store the register value in BUF in the given REGCACHE. */ + void (*store_function) (struct regcache *regcache, const char *buf); +}; + +/* A list of regsets for the target being debugged, terminated by an entry + where the size is negative. + + This list should be created by the target-specific code. */ + +extern struct lynx_regset_info lynx_target_regsets[]; + +/* The target-specific operations for LynxOS support. */ + +struct lynx_target_ops +{ + /* Architecture-specific setup. */ + void (*arch_setup) (void); +}; + +extern struct lynx_target_ops the_low_target; + diff --git a/gdb/gdbserver/lynx-ppc-low.c b/gdb/gdbserver/lynx-ppc-low.c new file mode 100644 index 0000000..9caa8ac --- /dev/null +++ b/gdb/gdbserver/lynx-ppc-low.c @@ -0,0 +1,186 @@ +/* Copyright (C) 2009, 2010 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include "server.h" +#include "lynx-low.h" + +#include <stdint.h> +#include <stddef.h> +#include <limits.h> +#include <ptrace.h> + +/* The following two typedefs are defined in a .h file which is not + in the standard include path (/sys/include/family/ppc/ucontext.h), + so we just duplicate them here. */ + +/* General register context */ +typedef struct usr_econtext_s +{ + uint32_t uec_iregs[32]; + uint32_t uec_inum; + uint32_t uec_srr0; + uint32_t uec_srr1; + uint32_t uec_lr; + uint32_t uec_ctr; + uint32_t uec_cr; + uint32_t uec_xer; + uint32_t uec_dar; + uint32_t uec_mq; + uint32_t uec_msr; + uint32_t uec_sregs[16]; + uint32_t uec_ss_count; + uint32_t uec_ss_addr1; + uint32_t uec_ss_addr2; + uint32_t uec_ss_code1; + uint32_t uec_ss_code2; +} usr_econtext_t; + +/* Floating point register context */ +typedef struct usr_fcontext_s +{ + uint64_t ufc_freg[32]; + uint32_t ufc_fpscr[2]; +} usr_fcontext_t; + +/* Index of for various registers inside the regcache. */ +#define R0_REGNUM 0 +#define F0_REGNUM 32 +#define PC_REGNUM 64 +#define MSR_REGNUM 65 +#define CR_REGNUM 66 +#define LR_REGNUM 67 +#define CTR_REGNUM 68 +#define XER_REGNUM 69 +#define FPSCR_REGNUM 70 + +/* Defined in auto-generated file powerpc-32.c. */ +extern void init_registers_powerpc_32 (void); + +/* The fill_function for the general-purpose register set. */ + +static void +lynx_ppc_fill_gregset (struct regcache *regcache, char *buf) +{ + int i; + + /* r0 - r31 */ + for (i = 0; i < 32; i++) + collect_register (regcache, R0_REGNUM + i, + buf + offsetof (usr_econtext_t, uec_iregs[i])); + + /* The other registers provided in the GP register context. */ + collect_register (regcache, PC_REGNUM, + buf + offsetof (usr_econtext_t, uec_srr0)); + collect_register (regcache, MSR_REGNUM, + buf + offsetof (usr_econtext_t, uec_srr1)); + collect_register (regcache, CR_REGNUM, + buf + offsetof (usr_econtext_t, uec_cr)); + collect_register (regcache, LR_REGNUM, + buf + offsetof (usr_econtext_t, uec_lr)); + collect_register (regcache, CTR_REGNUM, + buf + offsetof (usr_econtext_t, uec_ctr)); + collect_register (regcache, XER_REGNUM, + buf + offsetof (usr_econtext_t, uec_xer)); +} + +/* The store_function for the general-purpose register set. */ + +static void +lynx_ppc_store_gregset (struct regcache *regcache, const char *buf) +{ + int i; + + /* r0 - r31 */ + for (i = 0; i < 32; i++) + supply_register (regcache, R0_REGNUM + i, + buf + offsetof (usr_econtext_t, uec_iregs[i])); + + /* The other registers provided in the GP register context. */ + supply_register (regcache, PC_REGNUM, + buf + offsetof (usr_econtext_t, uec_srr0)); + supply_register (regcache, MSR_REGNUM, + buf + offsetof (usr_econtext_t, uec_srr1)); + supply_register (regcache, CR_REGNUM, + buf + offsetof (usr_econtext_t, uec_cr)); + supply_register (regcache, LR_REGNUM, + buf + offsetof (usr_econtext_t, uec_lr)); + supply_register (regcache, CTR_REGNUM, + buf + offsetof (usr_econtext_t, uec_ctr)); + supply_register (regcache, XER_REGNUM, + buf + offsetof (usr_econtext_t, uec_xer)); +} + +/* The fill_function for the floating-point register set. */ + +static void +lynx_ppc_fill_fpregset (struct regcache *regcache, char *buf) +{ + int i; + + /* f0 - f31 */ + for (i = 0; i < 32; i++) + collect_register (regcache, F0_REGNUM + i, + buf + offsetof (usr_fcontext_t, ufc_freg[i])); + + /* fpscr */ + collect_register (regcache, FPSCR_REGNUM, + buf + offsetof (usr_fcontext_t, ufc_fpscr)); +} + +/* The store_function for the floating-point register set. */ + +static void +lynx_ppc_store_fpregset (struct regcache *regcache, const char *buf) +{ + int i; + + /* f0 - f31 */ + for (i = 0; i < 32; i++) + supply_register (regcache, F0_REGNUM + i, + buf + offsetof (usr_fcontext_t, ufc_freg[i])); + + /* fpscr */ + supply_register (regcache, FPSCR_REGNUM, + buf + offsetof (usr_fcontext_t, ufc_fpscr)); +} + +/* Implements the lynx_target_ops.arch_setup routine. */ + +static void +lynx_ppc_arch_setup (void) +{ + init_registers_powerpc_32 (); +} + +/* Description of all the powerpc-lynx register sets. */ + +struct lynx_regset_info lynx_target_regsets[] = { + /* General Purpose Registers. */ + {PTRACE_GETREGS, PTRACE_SETREGS, sizeof(usr_econtext_t), + lynx_ppc_fill_gregset, lynx_ppc_store_gregset}, + /* Floating Point Registers. */ + { PTRACE_GETFPREGS, PTRACE_SETFPREGS, sizeof(usr_fcontext_t), + lynx_ppc_fill_fpregset, lynx_ppc_store_fpregset }, + /* End of list marker. */ + {0, 0, -1, NULL, NULL } +}; + +/* The lynx_target_ops vector for powerpc-lynxos. */ + +struct lynx_target_ops the_low_target = { + lynx_ppc_arch_setup, +}; ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [RFA 3/3] gdbserver support for powerpc-lynxos (4.x) 2010-08-31 19:38 ` Joel Brobecker @ 2010-08-31 20:24 ` Pedro Alves 2010-09-01 18:36 ` Joel Brobecker 0 siblings, 1 reply; 13+ messages in thread From: Pedro Alves @ 2010-08-31 20:24 UTC (permalink / raw) To: Joel Brobecker; +Cc: gdb-patches On Tuesday 31 August 2010 20:37:31, Joel Brobecker wrote: > Note that I'm adding a new varialble "srv_extra_libs" in configure.srv. > I need this because I need to link against -linet. Perhaps the right way > of doing things might have been to use a configure check... I think this comment is stale. > + status->kind = TARGET_WAITKIND_EXITED; > + status->value.integer = target_signal_from_host (WEXITSTATUS (wstat)); This target_signal_from_host call is wrong here. The program's exit status is not a signal (see gdb/target.c:store_waitstatus). > + /* SIGTRAP events are generated for situations other than single-step/ > + breakpoint events (Eg. new-thread events). Handle those other types > + of events, and resume the execution if necessary. */ > + if (status->kind == TARGET_WAITKIND_STOPPED > + && status->value.integer == target_signal_from_host (SIGTRAP)) Just write TARGET_SIGNAL_TRAP. > +static int > +lynx_kill (int pid) > +{ > + ptid_t ptid = lynx_ptid_build (pid, 0); > + struct target_waitstatus status; > + > + lynx_ptrace (PTRACE_KILL, ptid, 0, 0, 0); > + lynx_wait (ptid, &status, 0); > + return 0; > +} Should call the_target->mourn (process); > +/* Implement the detach target_ops method. */ > + > +static int > +lynx_detach (int pid) > +{ > + ptid_t ptid = lynx_ptid_build (pid, 0); > + > + lynx_ptrace (PTRACE_DETACH, ptid, 0, 0, 0); > + return 0; > +} Should call the_target->mourn (process); > + buf = lynx_ptrace (PTRACE_PEEKTEXT, inferior_ptid, addr, 0, 0); > + if (errno) > + return errno; lynx_ptrace is not taking care of preserving the errno set by the ptrace call: > + result = ptrace (request, pid, addr, data, addr2); > + if (debug_threads) > + printf (" -> %d (=0x%x)\n", result, result); > + > + return result; > +} ... that printf call clobbers errno when debug_threads is on. And you should use "fprintf (stderr, " for debug output throughout. > + memcpy (myaddr + (addr - memaddr) + skip, (gdb_byte *)&buf + skip, You should have a space after the cast (there are more instances of this). Other than that it looks fine to me. -- Pedro Alves ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [RFA 3/3] gdbserver support for powerpc-lynxos (4.x) 2010-08-31 20:24 ` Pedro Alves @ 2010-09-01 18:36 ` Joel Brobecker 2010-09-01 18:42 ` Pedro Alves 0 siblings, 1 reply; 13+ messages in thread From: Joel Brobecker @ 2010-09-01 18:36 UTC (permalink / raw) To: Pedro Alves; +Cc: gdb-patches [-- Attachment #1: Type: text/plain, Size: 458 bytes --] > Other than that it looks fine to me. Thanks for the thorough review! Attached first is a patch that shows the changes I made following your comments - this should help showing exactly what changed since the previous submission. Second patch is the actual patch itself. Tested on ppc-lynxos. If this new version is fine, then I'll commit the 3 patches either today or tomorrow... Thanks again for helping me getting these patches into shape. -- Joel [-- Attachment #2: gdbserver-lynxos-changes.diff --] [-- Type: text/x-diff, Size: 4096 bytes --] diff --git a/gdb/gdbserver/lynx-low.c b/gdb/gdbserver/lynx-low.c index dba26d0..7a949c0 100644 --- a/gdb/gdbserver/lynx-low.c +++ b/gdb/gdbserver/lynx-low.c @@ -41,9 +41,9 @@ lynx_debug (char *string, ...) return; va_start (args, string); - fprintf (stdout, "DEBUG(lynx): "); - vfprintf (stdout, string, args); - fprintf (stdout, "\n"); + fprintf (stderr, "DEBUG(lynx): "); + vfprintf (stderr, string, args); + fprintf (stderr, "\n"); va_end (args); } @@ -310,16 +310,19 @@ lynx_ptrace (int request, ptid_t ptid, int addr, int data, int addr2) { int result; const int pid = lynx_ptrace_pid_from_ptid (ptid); + int saved_errno; if (debug_threads) - printf ("PTRACE (%s, pid=%d(pid=%d, tid=%d), addr=0x%x, data=0x%x, " - "addr2=0x%x)", - ptrace_request_to_str (request), pid, PIDGET (pid), TIDGET (pid), - addr, data, addr2); + fprintf (stderr, "PTRACE (%s, pid=%d(pid=%d, tid=%d), addr=0x%x, " + "data=0x%x, addr2=0x%x)", + ptrace_request_to_str (request), pid, PIDGET (pid), TIDGET (pid), + addr, data, addr2); result = ptrace (request, pid, addr, data, addr2); + saved_errno = errno; if (debug_threads) - printf (" -> %d (=0x%x)\n", result, result); + fprintf (stderr, " -> %d (=0x%x)\n", result, result); + errno = saved_errno; return result; } @@ -494,7 +497,7 @@ retry: else if (WIFEXITED (wstat)) { status->kind = TARGET_WAITKIND_EXITED; - status->value.integer = target_signal_from_host (WEXITSTATUS (wstat)); + status->value.integer = WEXITSTATUS (wstat); lynx_debug ("process exited with code: %d", status->value.integer); } else if (WIFSIGNALED (wstat)) @@ -518,7 +521,7 @@ retry: breakpoint events (Eg. new-thread events). Handle those other types of events, and resume the execution if necessary. */ if (status->kind == TARGET_WAITKIND_STOPPED - && status->value.integer == target_signal_from_host (SIGTRAP)) + && status->value.integer == TARGET_SIGNAL_TRAP) { const int realsig = lynx_ptrace (PTRACE_GETTRACESIG, new_ptid, 0, 0, 0); @@ -565,9 +568,15 @@ lynx_kill (int pid) { ptid_t ptid = lynx_ptid_build (pid, 0); struct target_waitstatus status; + struct process_info *process; + + process = find_process_pid (pid); + if (process == NULL) + return -1; lynx_ptrace (PTRACE_KILL, ptid, 0, 0, 0); lynx_wait (ptid, &status, 0); + the_target->mourn (process); return 0; } @@ -577,8 +586,14 @@ static int lynx_detach (int pid) { ptid_t ptid = lynx_ptid_build (pid, 0); + struct process_info *process; + + process = find_process_pid (pid); + if (process == NULL) + return -1; lynx_ptrace (PTRACE_DETACH, ptid, 0, 0, 0); + the_target->mourn (process); return 0; } @@ -675,7 +690,7 @@ lynx_read_memory (CORE_ADDR memaddr, unsigned char *myaddr, int len) of int types, and they should also be aligned accordingly. */ int buf; const int xfer_size = sizeof (buf); - CORE_ADDR addr = memaddr & -(CORE_ADDR)xfer_size; + CORE_ADDR addr = memaddr & -(CORE_ADDR) xfer_size; ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); while (addr < memaddr + len) @@ -691,7 +706,7 @@ lynx_read_memory (CORE_ADDR memaddr, unsigned char *myaddr, int len) buf = lynx_ptrace (PTRACE_PEEKTEXT, inferior_ptid, addr, 0, 0); if (errno) return errno; - memcpy (myaddr + (addr - memaddr) + skip, (gdb_byte *)&buf + skip, + memcpy (myaddr + (addr - memaddr) + skip, (gdb_byte *) &buf + skip, xfer_size - skip - truncate); addr += xfer_size; } @@ -708,7 +723,7 @@ lynx_write_memory (CORE_ADDR memaddr, const unsigned char *myaddr, int len) of int types, and they should also be aligned accordingly. */ int buf; const int xfer_size = sizeof (buf); - CORE_ADDR addr = memaddr & -(CORE_ADDR)xfer_size; + CORE_ADDR addr = memaddr & -(CORE_ADDR) xfer_size; ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); while (addr < memaddr + len) [-- Attachment #3: gdbserver-lynxos.diff --] [-- Type: text/x-diff, Size: 33308 bytes --] commit 5fac95785126e642a55c287aee654193556d71d2 Author: Joel Brobecker <brobecker@adacore.com> Date: Tue Dec 1 23:20:56 2009 -0500 gdbserver support for powerpc-lynxos (4.x) This patch adds support for powerpc-lynxos. gdbserver/ChangeLog: * gdbserver/lynx-low.c, gdbserver/lynx-low.h, gdbserver/lynx-ppc-low.c: New files. * Makefile.in (lynx_low_h): New variable. (lynx-low.o, lynx-ppc-low.o): New rules. * configure.ac: On LynxOS, link with -lnetinet. * configure.srv: Add handling of powerpc-*-lynxos* targets. * configure: regenerate. diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index a12d895..fa6c102 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -303,6 +303,8 @@ server_h = $(srcdir)/server.h $(regcache_h) config.h $(srcdir)/target.h \ linux_low_h = $(srcdir)/linux-low.h +lynx_low_h = $(srcdir)/lynx-low.h $(srcdir)/server.h + nto_low_h = $(srcdir)/nto-low.h UST_CFLAGS = $(ustinc) -DCONFIG_UST_GDB_INTEGRATION @@ -390,6 +392,8 @@ linux-x86-low.o: linux-x86-low.c $(linux_low_h) $(server_h) \ $(gdb_proc_service_h) $(i386_low_h) linux-xtensa-low.o: linux-xtensa-low.c xtensa-xtregs.c $(linux_low_h) $(server_h) +lynx-low.o: lynx-low.c $(server_h) $(target_h) $(lynx_low_h) +lynx-ppc-low.o: lynx-ppc-low.c $(server_h) $(lynx_low_h) nto-low.o: nto-low.c $(server_h) $(nto_low_h) nto-x86-low.o: nto-x86-low.c $(server_h) $(nto_low_h) $(regdef_h) $(regcache_h) diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index 957cbc8..556cbb3 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -4439,6 +4439,8 @@ elif test "${srv_mingw}" = "yes"; then LIBS="$LIBS -lws2_32" elif test "${srv_qnx}" = "yes"; then LIBS="$LIBS -lsocket" +elif test "${srv_lynxos}" = "yes"; then + LIBS="$LIBS -lnetinet" fi if test "${srv_mingw}" = "yes"; then diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac index c61ab54..85b1a7b 100644 --- a/gdb/gdbserver/configure.ac +++ b/gdb/gdbserver/configure.ac @@ -212,6 +212,8 @@ elif test "${srv_mingw}" = "yes"; then LIBS="$LIBS -lws2_32" elif test "${srv_qnx}" = "yes"; then LIBS="$LIBS -lsocket" +elif test "${srv_lynxos}" = "yes"; then + LIBS="$LIBS -lnetinet" fi if test "${srv_mingw}" = "yes"; then diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv index 99187a5..8a14759 100644 --- a/gdb/gdbserver/configure.srv +++ b/gdb/gdbserver/configure.srv @@ -200,6 +200,10 @@ case "${target}" in srv_linux_regsets=yes srv_linux_thread_db=yes ;; + powerpc-*-lynxos*) srv_regobj="powerpc-32.o" + srv_tgtobj="lynx-low.o lynx-ppc-low.o" + srv_lynxos=yes + ;; s390*-*-linux*) srv_regobj="s390-linux32.o" srv_regobj="${srv_regobj} s390-linux64.o" srv_regobj="${srv_regobj} s390x-linux64.o" diff --git a/gdb/gdbserver/lynx-low.c b/gdb/gdbserver/lynx-low.c new file mode 100644 index 0000000..7a949c0 --- /dev/null +++ b/gdb/gdbserver/lynx-low.c @@ -0,0 +1,810 @@ +/* Copyright (C) 2009, 2010 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include "server.h" +#include "target.h" +#include "lynx-low.h" + +#include <limits.h> +#include <ptrace.h> +#include <sys/piddef.h> /* Provides PIDGET, TIDGET, BUILDPID, etc. */ +#include <unistd.h> +#include <sys/ioctl.h> +#include <sys/types.h> +#include <sys/wait.h> +#include <signal.h> + +int using_threads = 1; + +/* Print a debug trace on standard output if debug_threads is set. */ + +static void +lynx_debug (char *string, ...) +{ + va_list args; + + if (!debug_threads) + return; + + va_start (args, string); + fprintf (stderr, "DEBUG(lynx): "); + vfprintf (stderr, string, args); + fprintf (stderr, "\n"); + va_end (args); +} + +/* Build a ptid_t given a PID and a LynxOS TID. */ + +static ptid_t +lynx_ptid_build (int pid, long tid) +{ + /* brobecker/2010-06-21: It looks like the LWP field in ptids + should be distinct for each thread (see write_ptid where it + writes the thread ID from the LWP). So instead of storing + the LynxOS tid in the tid field of the ptid, we store it in + the lwp field. */ + return ptid_build (pid, tid, 0); +} + +/* Return the process ID of the given PTID. + + This function has little reason to exist, it's just a wrapper around + ptid_get_pid. But since we have a getter function for the lynxos + ptid, it feels cleaner to have a getter for the pid as well. */ + +static int +lynx_ptid_get_pid (ptid_t ptid) +{ + return ptid_get_pid (ptid); +} + +/* Return the LynxOS tid of the given PTID. */ + +static long +lynx_ptid_get_tid (ptid_t ptid) +{ + /* See lynx_ptid_build: The LynxOS tid is stored inside the lwp field + of the ptid. */ + return ptid_get_lwp (ptid); +} + +/* For a given PTID, return the associated PID as known by the LynxOS + ptrace layer. */ + +static int +lynx_ptrace_pid_from_ptid (ptid_t ptid) +{ + return BUILDPID (lynx_ptid_get_pid (ptid), lynx_ptid_get_tid (ptid)); +} + +/* Return a string image of the ptrace REQUEST number. */ + +static char * +ptrace_request_to_str (int request) +{ + switch (request) + { + case PTRACE_TRACEME: + return "PTRACE_TRACEME"; + break; + case PTRACE_PEEKTEXT: + return "PTRACE_PEEKTEXT"; + break; + case PTRACE_PEEKDATA: + return "PTRACE_PEEKDATA"; + break; + case PTRACE_PEEKUSER: + return "PTRACE_PEEKUSER"; + break; + case PTRACE_POKETEXT: + return "PTRACE_POKETEXT"; + break; + case PTRACE_POKEDATA: + return "PTRACE_POKEDATA"; + break; + case PTRACE_POKEUSER: + return "PTRACE_POKEUSER"; + break; + case PTRACE_CONT: + return "PTRACE_CONT"; + break; + case PTRACE_KILL: + return "PTRACE_KILL"; + break; + case PTRACE_SINGLESTEP: + return "PTRACE_SINGLESTEP"; + break; + case PTRACE_ATTACH: + return "PTRACE_ATTACH"; + break; + case PTRACE_DETACH: + return "PTRACE_DETACH"; + break; + case PTRACE_GETREGS: + return "PTRACE_GETREGS"; + break; + case PTRACE_SETREGS: + return "PTRACE_SETREGS"; + break; + case PTRACE_GETFPREGS: + return "PTRACE_GETFPREGS"; + break; + case PTRACE_SETFPREGS: + return "PTRACE_SETFPREGS"; + break; + case PTRACE_READDATA: + return "PTRACE_READDATA"; + break; + case PTRACE_WRITEDATA: + return "PTRACE_WRITEDATA"; + break; + case PTRACE_READTEXT: + return "PTRACE_READTEXT"; + break; + case PTRACE_WRITETEXT: + return "PTRACE_WRITETEXT"; + break; + case PTRACE_GETFPAREGS: + return "PTRACE_GETFPAREGS"; + break; + case PTRACE_SETFPAREGS: + return "PTRACE_SETFPAREGS"; + break; + case PTRACE_GETWINDOW: + return "PTRACE_GETWINDOW"; + break; + case PTRACE_SETWINDOW: + return "PTRACE_SETWINDOW"; + break; + case PTRACE_SYSCALL: + return "PTRACE_SYSCALL"; + break; + case PTRACE_DUMPCORE: + return "PTRACE_DUMPCORE"; + break; + case PTRACE_SETWRBKPT: + return "PTRACE_SETWRBKPT"; + break; + case PTRACE_SETACBKPT: + return "PTRACE_SETACBKPT"; + break; + case PTRACE_CLRBKPT: + return "PTRACE_CLRBKPT"; + break; + case PTRACE_GET_UCODE: + return "PTRACE_GET_UCODE"; + break; +#ifdef PT_READ_GPR + case PT_READ_GPR: + return "PT_READ_GPR"; + break; +#endif +#ifdef PT_WRITE_GPR + case PT_WRITE_GPR: + return "PT_WRITE_GPR"; + break; +#endif +#ifdef PT_READ_FPR + case PT_READ_FPR: + return "PT_READ_FPR"; + break; +#endif +#ifdef PT_WRITE_FPR + case PT_WRITE_FPR: + return "PT_WRITE_FPR"; + break; +#endif +#ifdef PTRACE_GETVECREGS + case PTRACE_GETVECREGS: + return "PTRACE_GETVECREGS"; + break; +#endif +#ifdef PTRACE_SETVECREGS + case PTRACE_SETVECREGS: + return "PTRACE_SETVECREGS"; + break; +#endif +#ifdef PT_READ_VPR + case PT_READ_VPR: + return "PT_READ_VPR"; + break; +#endif +#ifdef PT_WRITE_VPR + case PT_WRITE_VPR: + return "PT_WRITE_VPR"; + break; +#endif +#ifdef PTRACE_PEEKUSP + case PTRACE_PEEKUSP: + return "PTRACE_PEEKUSP"; + break; +#endif +#ifdef PTRACE_POKEUSP + case PTRACE_POKEUSP: + return "PTRACE_POKEUSP"; + break; +#endif + case PTRACE_PEEKTHREAD: + return "PTRACE_PEEKTHREAD"; + break; + case PTRACE_THREADUSER: + return "PTRACE_THREADUSER"; + break; + case PTRACE_FPREAD: + return "PTRACE_FPREAD"; + break; + case PTRACE_FPWRITE: + return "PTRACE_FPWRITE"; + break; + case PTRACE_SETSIG: + return "PTRACE_SETSIG"; + break; + case PTRACE_CONT_ONE: + return "PTRACE_CONT_ONE"; + break; + case PTRACE_KILL_ONE: + return "PTRACE_KILL_ONE"; + break; + case PTRACE_SINGLESTEP_ONE: + return "PTRACE_SINGLESTEP_ONE"; + break; + case PTRACE_GETLOADINFO: + return "PTRACE_GETLOADINFO"; + break; + case PTRACE_GETTHREADLIST: + return "PTRACE_GETTHREADLIST"; + break; + case PTRACE_POSTSYSCALL: + return "PTRACE_POSTSYSCALL"; + break; + case PTRACE_USE_SIGEXECED: + return "PTRACE_USE_SIGEXECED"; + break; + case PTRACE_GETTRACESIG: + return "PTRACE_GETTRACESIG"; + break; + case PTRACE_GETCWD: + return "PTRACE_GETCWD"; + break; + case PTRACE_TRAPFORK: + return "PTRACE_TRAPFORK"; + break; + case PTRACE_GETCHILDPID: + return "PTRACE_GETCHILDPID"; + break; + case PTRACE_SYSCALL_ONE: + return "PTRACE_SYSCALL_ONE"; + break; + case PTRACE_SIGMASK: + return "PTRACE_SIGMASK"; + break; + case PTRACE_GETIWD: + return "PTRACE_GETIWD"; + break; + case PTRACE_GETEXECFILE: + return "PTRACE_GETEXECFILE"; + break; + } + return "<unknown-request>"; +} + +/* A wrapper around ptrace that allows us to print debug traces of + ptrace calls if debug traces are activated. */ + +static int +lynx_ptrace (int request, ptid_t ptid, int addr, int data, int addr2) +{ + int result; + const int pid = lynx_ptrace_pid_from_ptid (ptid); + int saved_errno; + + if (debug_threads) + fprintf (stderr, "PTRACE (%s, pid=%d(pid=%d, tid=%d), addr=0x%x, " + "data=0x%x, addr2=0x%x)", + ptrace_request_to_str (request), pid, PIDGET (pid), TIDGET (pid), + addr, data, addr2); + result = ptrace (request, pid, addr, data, addr2); + saved_errno = errno; + if (debug_threads) + fprintf (stderr, " -> %d (=0x%x)\n", result, result); + + errno = saved_errno; + return result; +} + +/* Implement the create_inferior method of the target_ops vector. */ + +static int +lynx_create_inferior (char *program, char **allargs) +{ + struct process_info *new_process; + int pid; + + lynx_debug ("lynx_create_inferior ()"); + + pid = fork (); + if (pid < 0) + perror_with_name ("fork"); + + if (pid == 0) + { + int pgrp; + + /* Switch child to its own process group so that signals won't + directly affect gdbserver. */ + pgrp = getpid(); + setpgid (0, pgrp); + ioctl (0, TIOCSPGRP, &pgrp); + lynx_ptrace (PTRACE_TRACEME, null_ptid, 0, 0, 0); + execv (program, allargs); + fprintf (stderr, "Cannot exec %s: %s.\n", program, strerror (errno)); + fflush (stderr); + _exit (0177); + } + + new_process = add_process (pid, 0); + /* Do not add the process thread just yet, as we do not know its tid. + We will add it later, during the wait for the STOP event corresponding + to the lynx_ptrace (PTRACE_TRACEME) call above. */ + return pid; +} + +/* Implement the attach target_ops method. */ + +static int +lynx_attach (unsigned long pid) +{ + struct process_info *new_process; + ptid_t ptid = lynx_ptid_build (pid, 0); + + if (lynx_ptrace (PTRACE_ATTACH, ptid, 0, 0, 0) != 0) + error ("Cannot attach to process %lu: %s (%d)\n", pid, + strerror (errno), errno); + + new_process = add_process (pid, 1); + add_thread (ptid, NULL); + + return 0; +} + +/* Implement the resume target_ops method. */ + +static void +lynx_resume (struct thread_resume *resume_info, size_t n) +{ + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); + /* FIXME: Assume for now that n == 1. */ + const int request = (resume_info[0].kind == resume_step + ? PTRACE_SINGLESTEP : PTRACE_CONT); + const int signal = resume_info[0].sig; + int ret; + + regcache_invalidate (); + ret = lynx_ptrace (request, inferior_ptid, 1, signal, 0); +} + +/* Resume the execution of the given PTID. */ + +static void +lynx_continue (ptid_t ptid) +{ + struct thread_resume resume_info; + + resume_info.thread = ptid; + resume_info.kind = resume_continue; + resume_info.sig = 0; + + lynx_resume (&resume_info, 1); +} + +/* Remove all inferiors and associated threads. */ + +static void +lynx_clear_inferiors (void) +{ + /* We do not use private data, so nothing much to do except calling + clear_inferiors. */ + clear_inferiors (); +} + +/* A wrapper around waitpid that handles the various idiosyncrasies + of LynxOS' waitpid. */ + +static int +lynx_waitpid (int pid, int *stat_loc) +{ + int ret = 0; + + while (1) + { + ret = waitpid (pid, stat_loc, WNOHANG); + if (ret < 0) + { + /* An ECHILD error is not indicative of a real problem. + It happens for instance while waiting for the inferior + to stop after attaching to it. */ + if (errno != ECHILD) + perror_with_name ("waitpid (WNOHANG)"); + } + if (ret > 0) + break; + /* No event with WNOHANG. See if there is one with WUNTRACED. */ + ret = waitpid (pid, stat_loc, WNOHANG | WUNTRACED); + if (ret < 0) + { + /* An ECHILD error is not indicative of a real problem. + It happens for instance while waiting for the inferior + to stop after attaching to it. */ + if (errno != ECHILD) + perror_with_name ("waitpid (WNOHANG|WUNTRACED)"); + } + if (ret > 0) + break; + usleep (1000); + } + return ret; +} + +/* Implement the wait target_ops method. */ + +static ptid_t +lynx_wait_1 (ptid_t ptid, struct target_waitstatus *status, int options) +{ + int pid; + int ret; + int wstat; + ptid_t new_ptid; + + if (ptid_equal (ptid, minus_one_ptid)) + pid = lynx_ptid_get_pid (thread_to_gdb_id (current_inferior)); + else + pid = BUILDPID (lynx_ptid_get_pid (ptid), lynx_ptid_get_tid (ptid)); + +retry: + + ret = lynx_waitpid (pid, &wstat); + new_ptid = lynx_ptid_build (ret, ((union wait *) &wstat)->w_tid); + + /* If this is a new thread, then add it now. The reason why we do + this here instead of when handling new-thread events is because + we need to add the thread associated to the "main" thread - even + for non-threaded applications where the new-thread events are not + generated. */ + if (!find_thread_ptid (new_ptid)) + add_thread (new_ptid, NULL); + + if (WIFSTOPPED (wstat)) + { + status->kind = TARGET_WAITKIND_STOPPED; + status->value.integer = target_signal_from_host (WSTOPSIG (wstat)); + lynx_debug ("process stopped with signal: %d", + status->value.integer); + } + else if (WIFEXITED (wstat)) + { + status->kind = TARGET_WAITKIND_EXITED; + status->value.integer = WEXITSTATUS (wstat); + lynx_debug ("process exited with code: %d", status->value.integer); + } + else if (WIFSIGNALED (wstat)) + { + status->kind = TARGET_WAITKIND_SIGNALLED; + status->value.integer = target_signal_from_host (WTERMSIG (wstat)); + lynx_debug ("process terminated with code: %d", + status->value.integer); + } + else + { + /* Not sure what happened if we get here, or whether we can + in fact get here. But if we do, handle the event the best + we can. */ + status->kind = TARGET_WAITKIND_STOPPED; + status->value.integer = target_signal_from_host (0); + lynx_debug ("unknown event ????"); + } + + /* SIGTRAP events are generated for situations other than single-step/ + breakpoint events (Eg. new-thread events). Handle those other types + of events, and resume the execution if necessary. */ + if (status->kind == TARGET_WAITKIND_STOPPED + && status->value.integer == TARGET_SIGNAL_TRAP) + { + const int realsig = lynx_ptrace (PTRACE_GETTRACESIG, new_ptid, 0, 0, 0); + + lynx_debug ("(realsig = %d)", realsig); + switch (realsig) + { + case SIGNEWTHREAD: + /* We just added the new thread above. No need to do anything + further. Just resume the execution again. */ + lynx_continue (ptid); + goto retry; + + case SIGTHREADEXIT: + remove_thread (find_thread_ptid (new_ptid)); + lynx_continue (ptid); + goto retry; + } + } + + return new_ptid; +} + +/* A wrapper around lynx_wait_1 that also prints debug traces when + such debug traces have been activated. */ + +static ptid_t +lynx_wait (ptid_t ptid, struct target_waitstatus *status, int options) +{ + ptid_t new_ptid; + + lynx_debug ("lynx_wait (pid = %d, tid = %ld)", + lynx_ptid_get_pid (ptid), lynx_ptid_get_tid (ptid)); + new_ptid = lynx_wait_1 (ptid, status, options); + lynx_debug (" -> (pid=%d, tid=%ld, status->kind = %d)", + lynx_ptid_get_pid (new_ptid), lynx_ptid_get_tid (new_ptid), + status->kind); + return new_ptid; +} + +/* Implement the kill target_ops method. */ + +static int +lynx_kill (int pid) +{ + ptid_t ptid = lynx_ptid_build (pid, 0); + struct target_waitstatus status; + struct process_info *process; + + process = find_process_pid (pid); + if (process == NULL) + return -1; + + lynx_ptrace (PTRACE_KILL, ptid, 0, 0, 0); + lynx_wait (ptid, &status, 0); + the_target->mourn (process); + return 0; +} + +/* Implement the detach target_ops method. */ + +static int +lynx_detach (int pid) +{ + ptid_t ptid = lynx_ptid_build (pid, 0); + struct process_info *process; + + process = find_process_pid (pid); + if (process == NULL) + return -1; + + lynx_ptrace (PTRACE_DETACH, ptid, 0, 0, 0); + the_target->mourn (process); + return 0; +} + +/* Implement the mourn target_ops method. */ + +static void +lynx_mourn (struct process_info *proc) +{ + lynx_clear_inferiors (); +} + +/* Implement the join target_ops method. */ + +static void +lynx_join (int pid) +{ + /* The PTRACE_DETACH is sufficient to detach from the process. + So no need to do anything extra. */ +} + +/* Implement the thread_alive target_ops method. */ + +static int +lynx_thread_alive (ptid_t ptid) +{ + /* The list of threads is updated at the end of each wait, so it + should be up to date. No need to re-fetch it. */ + return (find_thread_ptid (ptid) != NULL); +} + +/* Implement the fetch_registers target_ops method. */ + +static void +lynx_fetch_registers (struct regcache *regcache, int regno) +{ + struct lynx_regset_info *regset = lynx_target_regsets; + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); + + lynx_debug ("lynx_fetch_registers (regno = %d)", regno); + + while (regset->size >= 0) + { + char *buf; + int res; + + buf = xmalloc (regset->size); + res = lynx_ptrace (regset->get_request, inferior_ptid, (int) buf, 0, 0); + if (res < 0) + perror ("ptrace"); + regset->store_function (regcache, buf); + free (buf); + regset++; + } +} + +/* Implement the store_registers target_ops method. */ + +static void +lynx_store_registers (struct regcache *regcache, int regno) +{ + struct lynx_regset_info *regset = lynx_target_regsets; + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); + + lynx_debug ("lynx_store_registers (regno = %d)", regno); + + while (regset->size >= 0) + { + char *buf; + int res; + + buf = xmalloc (regset->size); + res = lynx_ptrace (regset->get_request, inferior_ptid, (int) buf, 0, 0); + if (res == 0) + { + /* Then overlay our cached registers on that. */ + regset->fill_function (regcache, buf); + /* Only now do we write the register set. */ + res = lynx_ptrace (regset->set_request, inferior_ptid, (int) buf, + 0, 0); + } + if (res < 0) + perror ("ptrace"); + free (buf); + regset++; + } +} + +/* Implement the read_memory target_ops method. */ + +static int +lynx_read_memory (CORE_ADDR memaddr, unsigned char *myaddr, int len) +{ + /* On LynxOS, memory reads needs to be performed in chunks the size + of int types, and they should also be aligned accordingly. */ + int buf; + const int xfer_size = sizeof (buf); + CORE_ADDR addr = memaddr & -(CORE_ADDR) xfer_size; + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); + + while (addr < memaddr + len) + { + int skip = 0; + int truncate = 0; + + errno = 0; + if (addr < memaddr) + skip = memaddr - addr; + if (addr + xfer_size > memaddr + len) + truncate = addr + xfer_size - memaddr - len; + buf = lynx_ptrace (PTRACE_PEEKTEXT, inferior_ptid, addr, 0, 0); + if (errno) + return errno; + memcpy (myaddr + (addr - memaddr) + skip, (gdb_byte *) &buf + skip, + xfer_size - skip - truncate); + addr += xfer_size; + } + + return 0; +} + +/* Implement the write_memory target_ops method. */ + +static int +lynx_write_memory (CORE_ADDR memaddr, const unsigned char *myaddr, int len) +{ + /* On LynxOS, memory writes needs to be performed in chunks the size + of int types, and they should also be aligned accordingly. */ + int buf; + const int xfer_size = sizeof (buf); + CORE_ADDR addr = memaddr & -(CORE_ADDR) xfer_size; + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); + + while (addr < memaddr + len) + { + int skip = 0; + int truncate = 0; + + if (addr < memaddr) + skip = memaddr - addr; + if (addr + xfer_size > memaddr + len) + truncate = addr + xfer_size - memaddr - len; + if (skip > 0 || truncate > 0) + /* We need to read the memory at this address in order to preserve + the data that we are not overwriting. */ + lynx_read_memory (addr, (unsigned char *) &buf, xfer_size); + if (errno) + return errno; + memcpy ((gdb_byte *) &buf + skip, myaddr + (addr - memaddr) + skip, + xfer_size - skip - truncate); + errno = 0; + lynx_ptrace (PTRACE_POKETEXT, inferior_ptid, addr, buf, 0); + if (errno) + return errno; + addr += xfer_size; + } + + return 0; +} + +/* Implement the kill_request target_ops method. */ + +static void +lynx_request_interrupt (void) +{ + ptid_t inferior_ptid = thread_to_gdb_id (current_inferior); + + kill (lynx_ptid_get_pid (inferior_ptid), SIGINT); +} + +/* The LynxOS target_ops vector. */ + +static struct target_ops lynx_target_ops = { + lynx_create_inferior, + lynx_attach, + lynx_kill, + lynx_detach, + lynx_mourn, + lynx_join, + lynx_thread_alive, + lynx_resume, + lynx_wait, + lynx_fetch_registers, + lynx_store_registers, + NULL, /* prepare_to_access_memory */ + NULL, /* done_accessing_memory */ + lynx_read_memory, + lynx_write_memory, + NULL, /* look_up_symbols */ + lynx_request_interrupt, + NULL, /* read_auxv */ + NULL, /* insert_point */ + NULL, /* remove_point */ + NULL, /* stopped_by_watchpoint */ + NULL, /* stopped_data_address */ + NULL, /* read_offsets */ + NULL, /* get_tls_address */ + NULL, /* qxfer_spu */ + NULL, /* hostio_last_error */ + NULL, /* qxfer_osdata */ + NULL, /* qxfer_siginfo */ + NULL, /* supports_non_stop */ + NULL, /* async */ + NULL, /* start_non_stop */ + NULL, /* supports_multi_process */ + NULL, /* handle_monitor_command */ +}; + +void +initialize_low (void) +{ + set_target_ops (&lynx_target_ops); + the_low_target.arch_setup (); +} + diff --git a/gdb/gdbserver/lynx-low.h b/gdb/gdbserver/lynx-low.h new file mode 100644 index 0000000..1e004bf --- /dev/null +++ b/gdb/gdbserver/lynx-low.h @@ -0,0 +1,52 @@ +/* Copyright (C) 2010 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include "server.h" + +struct regcache; + +/* Some information relative to a given register set. */ + +struct lynx_regset_info +{ + /* The ptrace request needed to get/set registers of this set. */ + int get_request, set_request; + /* The size of the register set. */ + int size; + /* Fill the buffer BUF from the contents of the given REGCACHE. */ + void (*fill_function) (struct regcache *regcache, char *buf); + /* Store the register value in BUF in the given REGCACHE. */ + void (*store_function) (struct regcache *regcache, const char *buf); +}; + +/* A list of regsets for the target being debugged, terminated by an entry + where the size is negative. + + This list should be created by the target-specific code. */ + +extern struct lynx_regset_info lynx_target_regsets[]; + +/* The target-specific operations for LynxOS support. */ + +struct lynx_target_ops +{ + /* Architecture-specific setup. */ + void (*arch_setup) (void); +}; + +extern struct lynx_target_ops the_low_target; + diff --git a/gdb/gdbserver/lynx-ppc-low.c b/gdb/gdbserver/lynx-ppc-low.c new file mode 100644 index 0000000..9caa8ac --- /dev/null +++ b/gdb/gdbserver/lynx-ppc-low.c @@ -0,0 +1,186 @@ +/* Copyright (C) 2009, 2010 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include "server.h" +#include "lynx-low.h" + +#include <stdint.h> +#include <stddef.h> +#include <limits.h> +#include <ptrace.h> + +/* The following two typedefs are defined in a .h file which is not + in the standard include path (/sys/include/family/ppc/ucontext.h), + so we just duplicate them here. */ + +/* General register context */ +typedef struct usr_econtext_s +{ + uint32_t uec_iregs[32]; + uint32_t uec_inum; + uint32_t uec_srr0; + uint32_t uec_srr1; + uint32_t uec_lr; + uint32_t uec_ctr; + uint32_t uec_cr; + uint32_t uec_xer; + uint32_t uec_dar; + uint32_t uec_mq; + uint32_t uec_msr; + uint32_t uec_sregs[16]; + uint32_t uec_ss_count; + uint32_t uec_ss_addr1; + uint32_t uec_ss_addr2; + uint32_t uec_ss_code1; + uint32_t uec_ss_code2; +} usr_econtext_t; + +/* Floating point register context */ +typedef struct usr_fcontext_s +{ + uint64_t ufc_freg[32]; + uint32_t ufc_fpscr[2]; +} usr_fcontext_t; + +/* Index of for various registers inside the regcache. */ +#define R0_REGNUM 0 +#define F0_REGNUM 32 +#define PC_REGNUM 64 +#define MSR_REGNUM 65 +#define CR_REGNUM 66 +#define LR_REGNUM 67 +#define CTR_REGNUM 68 +#define XER_REGNUM 69 +#define FPSCR_REGNUM 70 + +/* Defined in auto-generated file powerpc-32.c. */ +extern void init_registers_powerpc_32 (void); + +/* The fill_function for the general-purpose register set. */ + +static void +lynx_ppc_fill_gregset (struct regcache *regcache, char *buf) +{ + int i; + + /* r0 - r31 */ + for (i = 0; i < 32; i++) + collect_register (regcache, R0_REGNUM + i, + buf + offsetof (usr_econtext_t, uec_iregs[i])); + + /* The other registers provided in the GP register context. */ + collect_register (regcache, PC_REGNUM, + buf + offsetof (usr_econtext_t, uec_srr0)); + collect_register (regcache, MSR_REGNUM, + buf + offsetof (usr_econtext_t, uec_srr1)); + collect_register (regcache, CR_REGNUM, + buf + offsetof (usr_econtext_t, uec_cr)); + collect_register (regcache, LR_REGNUM, + buf + offsetof (usr_econtext_t, uec_lr)); + collect_register (regcache, CTR_REGNUM, + buf + offsetof (usr_econtext_t, uec_ctr)); + collect_register (regcache, XER_REGNUM, + buf + offsetof (usr_econtext_t, uec_xer)); +} + +/* The store_function for the general-purpose register set. */ + +static void +lynx_ppc_store_gregset (struct regcache *regcache, const char *buf) +{ + int i; + + /* r0 - r31 */ + for (i = 0; i < 32; i++) + supply_register (regcache, R0_REGNUM + i, + buf + offsetof (usr_econtext_t, uec_iregs[i])); + + /* The other registers provided in the GP register context. */ + supply_register (regcache, PC_REGNUM, + buf + offsetof (usr_econtext_t, uec_srr0)); + supply_register (regcache, MSR_REGNUM, + buf + offsetof (usr_econtext_t, uec_srr1)); + supply_register (regcache, CR_REGNUM, + buf + offsetof (usr_econtext_t, uec_cr)); + supply_register (regcache, LR_REGNUM, + buf + offsetof (usr_econtext_t, uec_lr)); + supply_register (regcache, CTR_REGNUM, + buf + offsetof (usr_econtext_t, uec_ctr)); + supply_register (regcache, XER_REGNUM, + buf + offsetof (usr_econtext_t, uec_xer)); +} + +/* The fill_function for the floating-point register set. */ + +static void +lynx_ppc_fill_fpregset (struct regcache *regcache, char *buf) +{ + int i; + + /* f0 - f31 */ + for (i = 0; i < 32; i++) + collect_register (regcache, F0_REGNUM + i, + buf + offsetof (usr_fcontext_t, ufc_freg[i])); + + /* fpscr */ + collect_register (regcache, FPSCR_REGNUM, + buf + offsetof (usr_fcontext_t, ufc_fpscr)); +} + +/* The store_function for the floating-point register set. */ + +static void +lynx_ppc_store_fpregset (struct regcache *regcache, const char *buf) +{ + int i; + + /* f0 - f31 */ + for (i = 0; i < 32; i++) + supply_register (regcache, F0_REGNUM + i, + buf + offsetof (usr_fcontext_t, ufc_freg[i])); + + /* fpscr */ + supply_register (regcache, FPSCR_REGNUM, + buf + offsetof (usr_fcontext_t, ufc_fpscr)); +} + +/* Implements the lynx_target_ops.arch_setup routine. */ + +static void +lynx_ppc_arch_setup (void) +{ + init_registers_powerpc_32 (); +} + +/* Description of all the powerpc-lynx register sets. */ + +struct lynx_regset_info lynx_target_regsets[] = { + /* General Purpose Registers. */ + {PTRACE_GETREGS, PTRACE_SETREGS, sizeof(usr_econtext_t), + lynx_ppc_fill_gregset, lynx_ppc_store_gregset}, + /* Floating Point Registers. */ + { PTRACE_GETFPREGS, PTRACE_SETFPREGS, sizeof(usr_fcontext_t), + lynx_ppc_fill_fpregset, lynx_ppc_store_fpregset }, + /* End of list marker. */ + {0, 0, -1, NULL, NULL } +}; + +/* The lynx_target_ops vector for powerpc-lynxos. */ + +struct lynx_target_ops the_low_target = { + lynx_ppc_arch_setup, +}; ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [RFA 3/3] gdbserver support for powerpc-lynxos (4.x) 2010-09-01 18:36 ` Joel Brobecker @ 2010-09-01 18:42 ` Pedro Alves 2010-09-01 19:00 ` Joel Brobecker 0 siblings, 1 reply; 13+ messages in thread From: Pedro Alves @ 2010-09-01 18:42 UTC (permalink / raw) To: gdb-patches; +Cc: Joel Brobecker On Wednesday 01 September 2010 19:36:06, Joel Brobecker wrote: > If this new version is fine, then I'll commit the 3 patches either > today or tomorrow... Looks fine. > Thanks again for helping me getting these patches into shape. You're welcome. -- Pedro Alves ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [RFA 3/3] gdbserver support for powerpc-lynxos (4.x) 2010-09-01 18:42 ` Pedro Alves @ 2010-09-01 19:00 ` Joel Brobecker 0 siblings, 0 replies; 13+ messages in thread From: Joel Brobecker @ 2010-09-01 19:00 UTC (permalink / raw) To: Pedro Alves; +Cc: gdb-patches Thanks! All checked in. NEWS entry coming up... -- Joel ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2010-09-01 19:00 UTC | newest] Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2010-06-23 17:46 Add support for ppc-lynxos to GDBserver Joel Brobecker 2010-06-23 17:46 ` [RFA 2/3] Import vsnprintf from libiberty if not available Joel Brobecker 2010-06-23 19:19 ` Joseph S. Myers 2010-06-24 12:08 ` Pierre Muller 2010-06-24 12:40 ` Pierre Muller 2010-06-23 17:46 ` [RFA 1/3] Generate regformats/rs6000/powerpc-32.dat Joel Brobecker 2010-06-23 17:46 ` [RFA 3/3] gdbserver support for powerpc-lynxos (4.x) Joel Brobecker 2010-07-27 16:13 ` Pedro Alves 2010-08-31 19:38 ` Joel Brobecker 2010-08-31 20:24 ` Pedro Alves 2010-09-01 18:36 ` Joel Brobecker 2010-09-01 18:42 ` Pedro Alves 2010-09-01 19:00 ` Joel Brobecker
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).