From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20445 invoked by alias); 23 Apr 2009 00:33:51 -0000 Received: (qmail 20411 invoked by uid 22791); 23 Apr 2009 00:33:34 -0000 X-SWARE-Spam-Status: No, hits=-0.6 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_23,J_CHICKENPOX_37,J_CHICKENPOX_83,J_CHICKENPOX_84,LONGWORDS X-Spam-Check-By: sourceware.org Received: from e24smtp01.br.ibm.com (HELO e24smtp01.br.ibm.com) (32.104.18.85) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 23 Apr 2009 00:33:17 +0000 Received: from mailhub3.br.ibm.com (mailhub3.br.ibm.com [9.18.232.110]) by e24smtp01.br.ibm.com (8.13.1/8.13.1) with ESMTP id n3N0mk9L010682 for ; Wed, 22 Apr 2009 21:48:46 -0300 Received: from d24av01.br.ibm.com (d24av01.br.ibm.com [9.18.232.46]) by mailhub3.br.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n3N0XSEv2113756 for ; Wed, 22 Apr 2009 21:33:28 -0300 Received: from d24av01.br.ibm.com (loopback [127.0.0.1]) by d24av01.br.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n3N0X6xV029001 for ; Wed, 22 Apr 2009 21:33:06 -0300 Received: from [9.8.3.96] ([9.8.3.96]) by d24av01.br.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n3N0X5kO028990 for ; Wed, 22 Apr 2009 21:33:05 -0300 Subject: [PATCH 3/3] catch syscall -- try 5 -- Build-system, testcase, documentation and extra command From: =?ISO-8859-1?Q?S=E9rgio?= Durigan =?ISO-8859-1?Q?J=FAnior?= To: gdb-patches@sourceware.org Content-Type: multipart/mixed; boundary="=-VIC3koeFw/4M7DHukryS" Date: Thu, 23 Apr 2009 00:34:00 -0000 Message-Id: <1240446783.2000.83.camel@miki> Mime-Version: 1.0 X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2009-04/txt/msg00628.txt.bz2 --=-VIC3koeFw/4M7DHukryS Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 8bit Content-length: 1225 This is the part of the patch which adds build-system, testcase and documentation changes. It also adds the extra command "maint set data-directory". Regards, -- Sérgio Durigan Júnior Linux on Power Toolchain - Software Engineer Linux Technology Center - LTC IBM Brazil gdb/ChangeLog: 2009-04-22 Sergio Durigan Junior * Makefile.in: Support for relocatable GDB datadir and XML syscall. * NEWS: Added information about the catch syscall feature. * configure, config.in: Regenerate. * configure.ac: Support for relocatable GDB datadir. * defs.h (data_directory): New variable used for relocatable GDB datadir. * main.c: Add gdb_datadir variable to store the current GDB datadir. (captured_main): Add the GDB datadir relocatable handler. * maint.c: Create the "maintenance set gdb_datadir" command. gdb/doc/ChangeLog: 2009-04-22 Sergio Durigan Junior * gdb.texinfo (catch syscall): Documentation about the new feature. gdb/testsuite/ChangeLog: 2009-04-22 Sergio Durigan Junior * Makefile.in: Inclusion of catch-syscall object. * gdb.base/catch-syscall.c: New file. * gdb.base/catch-syscall.exp: New file. --=-VIC3koeFw/4M7DHukryS Content-Disposition: attachment; filename="catch-syscall-build-test-doc.patch" Content-Type: text/x-patch; name="catch-syscall-build-test-doc.patch"; charset="ISO-8859-1" Content-Transfer-Encoding: quoted-printable Content-length: 43138 diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 8a58425..5d6b1dd 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -166,6 +166,9 @@ INTL_CFLAGS =3D @INCINTL@ TARGET_SYSTEM_ROOT =3D @TARGET_SYSTEM_ROOT@ TARGET_SYSTEM_ROOT_DEFINE =3D @TARGET_SYSTEM_ROOT_DEFINE@ =20 +# Did the user give us a --with-gdb-datadir option? +GDB_DATADIR_PATH =3D @GDB_DATADIR_PATH@ + # Helper code from gnulib. LIBGNU =3D gnulib/libgnu.a INCGNU =3D -I$(srcdir)/gnulib -Ignulib @@ -458,6 +461,7 @@ TARGET_OBS =3D @TARGET_OBS@ # All target-dependent objects files that require 64-bit CORE_ADDR # (used with --enable-targets=3Dall --enable-64-bit-bfd). ALL_64_TARGET_OBS =3D \ + linux-tdep.o \ alphabsd-tdep.o alphafbsd-tdep.o alpha-linux-tdep.o alpha-mdebug-tdep.o \ alphanbsd-tdep.o alphaobsd-tdep.o alpha-osf1-tdep.o alpha-tdep.o \ amd64fbsd-tdep.o amd64-dicos-tdep.o amd64-linux-tdep.o amd64nbsd-tdep.o \ @@ -469,6 +473,7 @@ ALL_64_TARGET_OBS =3D \ =20 # All other target-dependent objects files (used with --enable-targets=3Da= ll). ALL_TARGET_OBS =3D \ + linux-tdep.o \ armbsd-tdep.o arm-linux-tdep.o armnbsd-tdep.o armobsd-tdep.o \ arm-tdep.o arm-wince-tdep.o \ avr-tdep.o \ @@ -664,6 +669,8 @@ SFILES =3D ada-exp.y ada-lang.c ada-typeprint.c ada-val= print.c ada-tasks.c \ valarith.c valops.c valprint.c value.c varobj.c vec.c \ wrapper.c \ xml-tdesc.c xml-support.c \ + linux-tdep.c \ + xml-syscall.c \ inferior.c gdb_usleep.c =20 LINTFILES =3D $(SFILES) $(YYFILES) $(CONFIG_SRCS) init.c @@ -674,7 +681,7 @@ LINTFILES =3D $(SFILES) $(YYFILES) $(CONFIG_SRCS) init.c # wrong if TAGS has files twice). Because this is tricky to get # right, it is probably easiest just to list .h files here directly. =20 -HFILES_NO_SRCDIR =3D osf-share/cma_debug_client.h \ +HFILES_NO_SRCDIR =3D osf-share/cma_debug_client.h linux-tdep.h \ osf-share/HP800/cma_thread_io.h osf-share/cma_sequence.h \ osf-share/cma_mutex.h osf-share/cma_semaphore_defs.h \ osf-share/cma_list.h osf-share/cma_handle.h osf-share/cma_stack.h \ @@ -735,7 +742,7 @@ config/rs6000/nm-rs6000.h top.h bsd-kvm.h gdb-stabs.h r= eggroups.h \ annotate.h sim-regno.h dictionary.h dfp.h main.h frame-unwind.h \ remote-fileio.h i386-linux-tdep.h vax-tdep.h objc-lang.h \ sentinel-frame.h bcache.h symfile.h windows-tdep.h linux-tdep.h \ -gdb_usleep.h +xml-syscall.h gdb_usleep.h =20 # Header files that already have srcdir in them, or which are in objdir. =20 @@ -814,10 +821,16 @@ COMMON_OBS =3D $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \ trad-frame.o \ tramp-frame.o \ solib.o solib-null.o \ - prologue-value.o memory-map.o xml-support.o \ + prologue-value.o memory-map.o xml-support.o xml-syscall.o \ target-descriptions.o target-memory.o xml-tdesc.o xml-builtin.o \ inferior.o osdata.o gdb_usleep.o =20 +# Definitions for the syscall's XML files and dir +XML_SYSCALLS_DIR =3D syscalls/ +XML_SYSCALLS_FILES =3D gdb-syscalls.dtd \ + ppc-linux.xml ppc64-linux.xml \ + i386-linux.xml amd64-linux.xml + TSOBS =3D inflow.o =20 SUBDIRS =3D @subdirs@ @@ -851,11 +864,41 @@ generated_files =3D config.h observer.h observer.inc = ada-lex.c \ $(COMPILE) $< $(POSTCOMPILE) =20 -all: gdb$(EXEEXT) $(CONFIG_ALL) +all: gdb$(EXEEXT) $(CONFIG_ALL) xml-syscall-copy @$(MAKE) $(FLAGS_TO_PASS) DO=3Dall "DODIRS=3D`echo $(SUBDIRS) | sed 's/te= stsuite//'`" subdir_do .PHONY: all-tui all-tui: $(TUI)$(EXEEXT) =20 +# This is needed for running GDB from the build directory +.PHONY: xml-syscall-copy +xml-syscall-copy: + if [ "`cd $(srcdir) && pwd`" !=3D "`pwd`" ] ; then \ + mkdir -p ./$(XML_SYSCALLS_DIR) ; \ + list=3D'$(XML_SYSCALLS_FILES)' ; \ + for file in $$list ; do \ + f=3D$(srcdir)/$(XML_SYSCALLS_DIR)/$$file ; \ + if test -f $$f ; then \ + $(INSTALL_DATA) $$f \ + ./$(XML_SYSCALLS_DIR) ; \ + fi ; \ + done ; \ + fi ; + +# This target is responsible for properly installing the syscalls' +# XML files in the system. +.PHONY: xml-syscall-install +xml-syscall-install: + $(SHELL) $(srcdir)/../mkinstalldirs \ + $(DESTDIR)$(GDB_DATADIR_PATH)/$(XML_SYSCALLS_DIR) ; \ + list=3D'$(XML_SYSCALLS_FILES)' ; \ + for file in $$list ; do \ + f=3D$(srcdir)/$(XML_SYSCALLS_DIR)/$$file ; \ + if test -f $$f ; then \ + $(INSTALL_DATA) $$f \ + $(DESTDIR)$(GDB_DATADIR_PATH)/$(XML_SYSCALLS_DIR) ; \ + fi ; \ + done ; + installcheck: =20 # The check target can not use subdir_do, because subdir_do does not @@ -909,8 +952,11 @@ gdb.z:gdb.1 # source file and doesn't care about rebuilding or just wants to save the # time it takes for make to check that all is up to date. # install-only is intended to address that need. -install: all install-only -install-only: $(CONFIG_INSTALL) +install: all install-only=20 + +# The "install-only" target also installs the syscalls' XML files in +# the system. +install-only: $(CONFIG_INSTALL) xml-syscall-install transformed_name=3D`t=3D'$(program_transform_name)'; \ echo gdb | sed -e "$$t"` ; \ if test "x$$transformed_name" =3D x; then \ @@ -1268,6 +1314,7 @@ force_update: MAKEOVERRIDES=3D =20 ALLDEPFILES =3D \ + linux-tdep.c \ aix-thread.c \ alpha-nat.c alphabsd-nat.c alpha-linux-nat.c \ alpha-tdep.c alpha-mdebug-tdep.c \ diff --git a/gdb/NEWS b/gdb/NEWS index 8382026..1eee0bf 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -3,6 +3,18 @@ =20 *** Changes since GDB 6.8 =20 +* GDB now has the new command `catch syscall'. It can be used to +catch when the inferior calls a system call, or when the system call +returns. Also, you can specify which system calls you would like GDB +to catch (or issue only a `catch syscall' without arguments, which will +make GDB catch every system call). For instance, if you would like to +catch the system call close, you would issue a: + + (gdb) catch syscall close + +This feature is available with a native GDB running on the following +architectures: x86, PowerPC and PowerPC64. + * GDB now supports hardware watchpoints on MIPS/Linux systems. This feature is available with a native GDB running on kernel version 2.6.28 or later. diff --git a/gdb/config.in b/gdb/config.in index 1bfd837..fb9c970 100644 --- a/gdb/config.in +++ b/gdb/config.in @@ -26,6 +26,12 @@ /* Define to 1 if using `alloca.c'. */ #undef C_ALLOCA =20 +/* Global directory for GDB data files. */ +#undef DATA_DIRECTORY + +/* Define if GDB data directory should be relocated when GDB is moved. */ +#undef DATA_DIRECTORY_RELOCATABLE + /* Global directory for separate debug files. */ #undef DEBUGDIR =20 diff --git a/gdb/configure b/gdb/configure index d709727..4884e22 100755 --- a/gdb/configure +++ b/gdb/configure @@ -314,7 +314,7 @@ ac_subdirs_all=3D"$ac_subdirs_all doc testsuite" ac_subdirs_all=3D"$ac_subdirs_all gdbtk" ac_subdirs_all=3D"$ac_subdirs_all multi-ice" ac_subdirs_all=3D"$ac_subdirs_all gdbserver" -ac_subst_vars=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE= _VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transf= orm_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir locals= tatedir libdir includedir oldincludedir infodir mandir build_alias host_ali= as target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAI= NER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP = EGREP RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_c= pu host_vendor host_os target target_cpu target_vendor target_os am__leadin= g_dot DEPDIR CCDEPMODE MAKE GMAKE_TRUE GMAKE_FALSE SET_MAKE USE_NLS LIBINTL= LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT= GENCAT CATOBJEXT localedir GL_COND_LIBTOOL_TRUE GL_COND_LIBTOOL_FALSE GNUL= IB_MEMMEM GNULIB_MEMPCPY GNULIB_MEMRCHR GNULIB_STPCPY GNULIB_STPNCPY GNULIB= _STRCHRNUL GNULIB_STRDUP GNULIB_STRNDUP GNULIB_STRNLEN GNULIB_STRPBRK GNULI= B_STRSEP GNULIB_STRSTR GNULIB_STRCASESTR GNULIB_STRTOK_R GNULIB_MBSLEN GNUL= IB_MBSNLEN GNULIB_MBSCHR GNULIB_MBSRCHR GNULIB_MBSSTR GNULIB_MBSCASECMP GNU= LIB_MBSNCASECMP GNULIB_MBSPCASECMP GNULIB_MBSCASESTR GNULIB_MBSCSPN GNULIB_= MBSPBRK GNULIB_MBSSPN GNULIB_MBSSEP GNULIB_MBSTOK_R GNULIB_STRERROR GNULIB_= STRSIGNAL HAVE_DECL_MEMMEM HAVE_MEMPCPY HAVE_DECL_MEMRCHR HAVE_STPCPY HAVE_= STPNCPY HAVE_STRCHRNUL HAVE_DECL_STRDUP HAVE_STRNDUP HAVE_DECL_STRNDUP HAVE= _DECL_STRNLEN HAVE_STRPBRK HAVE_STRSEP HAVE_STRCASESTR HAVE_DECL_STRTOK_R H= AVE_DECL_STRERROR HAVE_DECL_STRSIGNAL REPLACE_STRERROR REPLACE_STRSIGNAL RE= PLACE_MEMMEM REPLACE_STRCASESTR REPLACE_STRSTR HAVE_LONG_LONG_INT HAVE_UNSI= GNED_LONG_LONG_INT HAVE_INTTYPES_H HAVE_SYS_TYPES_H INCLUDE_NEXT NEXT_STDIN= T_H HAVE_STDINT_H HAVE_SYS_INTTYPES_H HAVE_SYS_BITYPES_H BITSIZEOF_PTRDIFF_= T BITSIZEOF_SIG_ATOMIC_T BITSIZEOF_SIZE_T BITSIZEOF_WCHAR_T BITSIZEOF_WINT_= T HAVE_SIGNED_SIG_ATOMIC_T HAVE_SIGNED_WCHAR_T HAVE_SIGNED_WINT_T PTRDIFF_T= _SUFFIX SIG_ATOMIC_T_SUFFIX SIZE_T_SUFFIX WCHAR_T_SUFFIX WINT_T_SUFFIX STDI= NT_H NEXT_STRING_H GNULIB_WCWIDTH HAVE_DECL_WCWIDTH REPLACE_WCWIDTH WCHAR_H= HAVE_WCHAR_H NEXT_WCHAR_H LIBGNU_LIBDEPS LIBGNU_LTLIBDEPS GNULIB_STDINT_H = PACKAGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W VERSION ACLOC= AL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTA= LL_STRIP_PROGRAM mkdir_p AWK AMTAR am__tar am__untar am__include am__quote = AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH am__fastdepCC_TRUE am__fastdepCC_FALS= E subdirs TARGET_OBS PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI LN_S YACC A= R ac_ct_AR DLLTOOL ac_ct_DLLTOOL WINDRES ac_ct_WINDRES MIG ac_ct_MIG READLI= NE READLINE_DEPS READLINE_CFLAGS HAVE_LIBEXPAT LIBEXPAT LTLIBEXPAT PYTHON_C= FLAGS ALLOCA CONFIG_LDFLAGS TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE WA= RN_CFLAGS WERROR_CFLAGS SER_HARDWIRE WIN32LIBS LIBGUI GUI_CFLAGS_X WIN32LDA= PP TCL_VERSION TCL_PATCH_LEVEL TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB= _FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TC= L_INCLUDE TCL_LIBRARY TCL_DEPS TK_VERSION TK_BIN_DIR TK_SRC_DIR TK_LIB_FILE= TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC= TK_INCLUDE TK_LIBRARY TK_DEPS TK_XINCLUDES X_CFLAGS X_LDFLAGS X_LIBS GDBTK= LIBS GDBTK_CFLAGS GDBTK_SRC_DIR SIM SIM_OBS ENABLE_CFLAGS PROFILE_CFLAGS CO= NFIG_OBS CONFIG_DEPS CONFIG_SRCS CONFIG_ALL CONFIG_CLEAN CONFIG_INSTALL CON= FIG_UNINSTALL target_subdir frags GDB_NM_FILE datarootdir docdir htmldir pd= fdir LIBOBJS LTLIBOBJS gl_LIBOBJS gl_LTLIBOBJS gltests_LIBOBJS gltests_LTLI= BOBJS' +ac_subst_vars=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE= _VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transf= orm_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir locals= tatedir libdir includedir oldincludedir infodir mandir build_alias host_ali= as target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAI= NER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP = EGREP RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_c= pu host_vendor host_os target target_cpu target_vendor target_os am__leadin= g_dot DEPDIR CCDEPMODE MAKE GMAKE_TRUE GMAKE_FALSE SET_MAKE USE_NLS LIBINTL= LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT= GENCAT CATOBJEXT localedir GL_COND_LIBTOOL_TRUE GL_COND_LIBTOOL_FALSE GNUL= IB_MEMMEM GNULIB_MEMPCPY GNULIB_MEMRCHR GNULIB_STPCPY GNULIB_STPNCPY GNULIB= _STRCHRNUL GNULIB_STRDUP GNULIB_STRNDUP GNULIB_STRNLEN GNULIB_STRPBRK GNULI= B_STRSEP GNULIB_STRSTR GNULIB_STRCASESTR GNULIB_STRTOK_R GNULIB_MBSLEN GNUL= IB_MBSNLEN GNULIB_MBSCHR GNULIB_MBSRCHR GNULIB_MBSSTR GNULIB_MBSCASECMP GNU= LIB_MBSNCASECMP GNULIB_MBSPCASECMP GNULIB_MBSCASESTR GNULIB_MBSCSPN GNULIB_= MBSPBRK GNULIB_MBSSPN GNULIB_MBSSEP GNULIB_MBSTOK_R GNULIB_STRERROR GNULIB_= STRSIGNAL HAVE_DECL_MEMMEM HAVE_MEMPCPY HAVE_DECL_MEMRCHR HAVE_STPCPY HAVE_= STPNCPY HAVE_STRCHRNUL HAVE_DECL_STRDUP HAVE_STRNDUP HAVE_DECL_STRNDUP HAVE= _DECL_STRNLEN HAVE_STRPBRK HAVE_STRSEP HAVE_STRCASESTR HAVE_DECL_STRTOK_R H= AVE_DECL_STRERROR HAVE_DECL_STRSIGNAL REPLACE_STRERROR REPLACE_STRSIGNAL RE= PLACE_MEMMEM REPLACE_STRCASESTR REPLACE_STRSTR HAVE_LONG_LONG_INT HAVE_UNSI= GNED_LONG_LONG_INT HAVE_INTTYPES_H HAVE_SYS_TYPES_H INCLUDE_NEXT NEXT_STDIN= T_H HAVE_STDINT_H HAVE_SYS_INTTYPES_H HAVE_SYS_BITYPES_H BITSIZEOF_PTRDIFF_= T BITSIZEOF_SIG_ATOMIC_T BITSIZEOF_SIZE_T BITSIZEOF_WCHAR_T BITSIZEOF_WINT_= T HAVE_SIGNED_SIG_ATOMIC_T HAVE_SIGNED_WCHAR_T HAVE_SIGNED_WINT_T PTRDIFF_T= _SUFFIX SIG_ATOMIC_T_SUFFIX SIZE_T_SUFFIX WCHAR_T_SUFFIX WINT_T_SUFFIX STDI= NT_H NEXT_STRING_H GNULIB_WCWIDTH HAVE_DECL_WCWIDTH REPLACE_WCWIDTH WCHAR_H= HAVE_WCHAR_H NEXT_WCHAR_H LIBGNU_LIBDEPS LIBGNU_LTLIBDEPS GNULIB_STDINT_H = PACKAGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W VERSION ACLOC= AL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTA= LL_STRIP_PROGRAM mkdir_p AWK AMTAR am__tar am__untar am__include am__quote = AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH am__fastdepCC_TRUE am__fastdepCC_FALS= E DATA_DIRECTORY_PATH subdirs TARGET_OBS PKGVERSION REPORT_BUGS_TO REPORT_B= UGS_TEXI LN_S YACC AR ac_ct_AR DLLTOOL ac_ct_DLLTOOL WINDRES ac_ct_WINDRES = MIG ac_ct_MIG READLINE READLINE_DEPS READLINE_CFLAGS HAVE_LIBEXPAT LIBEXPAT= LTLIBEXPAT PYTHON_CFLAGS ALLOCA CONFIG_LDFLAGS TARGET_SYSTEM_ROOT TARGET_S= YSTEM_ROOT_DEFINE WARN_CFLAGS WERROR_CFLAGS SER_HARDWIRE WIN32LIBS LIBGUI G= UI_CFLAGS_X WIN32LDAPP TCL_VERSION TCL_PATCH_LEVEL TCL_BIN_DIR TCL_SRC_DIR = TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG = TCL_STUB_LIB_SPEC TCL_INCLUDE TCL_LIBRARY TCL_DEPS TK_VERSION TK_BIN_DIR TK= _SRC_DIR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_F= LAG TK_STUB_LIB_SPEC TK_INCLUDE TK_LIBRARY TK_DEPS TK_XINCLUDES X_CFLAGS X_= LDFLAGS X_LIBS GDBTKLIBS GDBTK_CFLAGS GDBTK_SRC_DIR SIM SIM_OBS ENABLE_CFLA= GS PROFILE_CFLAGS CONFIG_OBS CONFIG_DEPS CONFIG_SRCS CONFIG_ALL CONFIG_CLEA= N CONFIG_INSTALL CONFIG_UNINSTALL target_subdir frags GDB_NM_FILE datarootd= ir docdir htmldir pdfdir LIBOBJS LTLIBOBJS gl_LIBOBJS gl_LTLIBOBJS gltests_= LIBOBJS gltests_LTLIBOBJS' ac_subst_files=3D'host_makefile_frag' ac_pwd=3D`pwd` =20 @@ -887,6 +887,8 @@ Optional Packages: --with-separate-debug-dir=3DPATH look for global separate debug info in this path [LIBDIR/debug] + --with-data-directory look for global separate data files in this path + [DATADIR/gdb] --with-relocated-sources=3DPATH automatically relocate this path for source files --with-libunwind use libunwind frame unwinding support @@ -6569,7 +6571,6 @@ am__api_version=3D"1.9" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then @@ -6603,18 +6604,8 @@ case $as_dir/ in # program-specific install script used by HP pwplus--don't use. : else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`= /conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install=3D"$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi + ac_cv_path_install=3D"$as_dir/$ac_prog$ac_exec_ext -c" + break 3 fi fi done @@ -6623,16 +6614,15 @@ case $as_dir/ in esac done =20 -rm -rf conftest.one conftest.two conftest.dir =20 fi if test "${ac_cv_path_install+set}" =3D set; then INSTALL=3D$ac_cv_path_install else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. We don't cache a + # path for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the value is a relative name. + # removed, or if the path is relative. INSTALL=3D$ac_install_sh fi fi @@ -7147,6 +7137,52 @@ _ACEOF ;; esac =20 +# GDB's data directory relocation + +data_directory=3D${datadir}/gdb + + +# Check whether --with-data-directory or --without-data-directory was give= n. +if test "${with_data_directory+set}" =3D set; then + withval=3D"$with_data_directory" + data_directory=3D"${withval}" +fi; + + + test "x$prefix" =3D xNONE && prefix=3D"$ac_default_prefix" + test "x$exec_prefix" =3D xNONE && exec_prefix=3D'${prefix}' + ac_define_dir=3D`eval echo $data_directory` + ac_define_dir=3D`eval echo $ac_define_dir` + +cat >>confdefs.h <<_ACEOF +#define DATA_DIRECTORY "$ac_define_dir" +_ACEOF + + + +if test "x$exec_prefix" =3D xNONE || test "x$exec_prefix" =3D 'x${prefix}'= ; then + if test "x$prefix" =3D xNONE; then + test_prefix=3D/usr/local + else + test_prefix=3D$prefix + fi +else + test_prefix=3D$exec_prefix +fi + +case ${data_directory} in + "${test_prefix}"|"${test_prefix}/"*|\ + '${exec_prefix}'|'${exec_prefix}/'*) + +cat >>confdefs.h <<\_ACEOF +#define DATA_DIRECTORY_RELOCATABLE 1 +_ACEOF + + ;; +esac +DATA_DIRECTORY_PATH=3D${data_directory} + + =20 # Check whether --with-relocated-sources or --without-relocated-sources wa= s given. if test "${with_relocated_sources+set}" =3D set; then @@ -8599,7 +8635,6 @@ done # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then @@ -8633,18 +8668,8 @@ case $as_dir/ in # program-specific install script used by HP pwplus--don't use. : else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`= /conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install=3D"$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi + ac_cv_path_install=3D"$as_dir/$ac_prog$ac_exec_ext -c" + break 3 fi fi done @@ -8653,16 +8678,15 @@ case $as_dir/ in esac done =20 -rm -rf conftest.one conftest.two conftest.dir =20 fi if test "${ac_cv_path_install+set}" =3D set; then INSTALL=3D$ac_cv_path_install else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. We don't cache a + # path for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the value is a relative name. + # removed, or if the path is relative. INSTALL=3D$ac_install_sh fi fi @@ -22112,6 +22136,7 @@ s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t +s,@DATA_DIRECTORY_PATH@,$DATA_DIRECTORY_PATH,;t t s,@subdirs@,$subdirs,;t t s,@TARGET_OBS@,$TARGET_OBS,;t t s,@PKGVERSION@,$PKGVERSION,;t t diff --git a/gdb/configure.ac b/gdb/configure.ac index 4c2768d..0718b94 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -118,6 +118,36 @@ case ${debugdir} in ;; esac =20 +# GDB's data directory relocation + +data_directory=3D${datadir}/gdb + +AC_ARG_WITH([data-directory], + [AS_HELP_STRING([--with-data-directory], + [look for global separate data files in this path [DATAD= IR/gdb]])], [data_directory=3D"${withval}"]) + +AC_DEFINE_DIR(DATA_DIRECTORY, data_directory, + [Global directory for GDB data files. ]) + +if test "x$exec_prefix" =3D xNONE || test "x$exec_prefix" =3D 'x${prefix}'= ; then + if test "x$prefix" =3D xNONE; then + test_prefix=3D/usr/local + else + test_prefix=3D$prefix + fi +else + test_prefix=3D$exec_prefix +fi + +case ${data_directory} in + "${test_prefix}"|"${test_prefix}/"*|\ + '${exec_prefix}'|'${exec_prefix}/'*) + AC_DEFINE(DATA_DIRECTORY_RELOCATABLE, 1, [Define if GDB data directory= should be relocated when GDB is moved.]) + ;; +esac +DATA_DIRECTORY_PATH=3D${data_directory} +AC_SUBST(DATA_DIRECTORY_PATH) + AC_ARG_WITH(relocated-sources, AS_HELP_STRING([--with-relocated-sources=3DPATH], [automatically relocate = this path for source files]), [reloc_srcdir=3D"${withval}" diff --git a/gdb/defs.h b/gdb/defs.h index 882a844..ddd3e82 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -153,6 +153,9 @@ extern int dbx_commands; /* System root path, used to find libraries etc. */ extern char *gdb_sysroot; =20 +/* GDB datadir, used to store data files. */ +extern char *data_directory; + /* Search path for separate debug files. */ extern char *debug_file_directory; =20 diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 2cdac20..27e12a3 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -3640,6 +3640,106 @@ A failed Ada assertion. A call to @code{exec}. This is currently only available for HP-UX and @sc{gnu}/Linux. =20 +@item syscall +@itemx syscall @r{[}@var{name} @r{|} @var{number}@r{]} @r{...} +@cindex break on a system call. +A call to or return from a @code{syscall}. If no argument is specified, +then it catches a call to or return from any system call. + +@var{name} can be any valid system call name in the system. You can +use the @value{GDBN} command-line completion facilities to list the +available choices. @xref{Completion,, Command Completion}, for +details on how to do this. + +You may also specify the system call numerically. This may be useful +if @value{GDBN} does not fully support your system's list of system +calls. + +The example below illustrates how this command works if you don't provide +arguments to it: + +@smallexample +(@value{GDBP}) catch syscall +Catchpoint 1 (syscall) +(@value{GDBP}) r +Starting program: /tmp/catch-syscall + +Catchpoint 1 (call to syscall 'close'), \ + 0xffffe424 in __kernel_vsyscall () +(@value{GDBP}) c +Continuing. + +Catchpoint 1 (returned from syscall 'close'), \ + 0xffffe424 in __kernel_vsyscall () +(@value{GDBP}) +@end smallexample + +Here is an example of catching a system call by name: + +@smallexample +(@value{GDBP}) catch syscall chroot +Catchpoint 1 (syscall(s) 'chroot') +(@value{GDBP}) r +Starting program: /tmp/catch-syscall + +Catchpoint 1 (call to syscall 'chroot'), \ + 0xffffe424 in __kernel_vsyscall () +(@value{GDBP}) c +Continuing. + +Catchpoint 1 (returned from syscall 'chroot'), \ + 0xffffe424 in __kernel_vsyscall () +(@value{GDBP}) +@end smallexample + +And last but not least, an example of specifying a system call +numerically: + +@smallexample +(@value{GDBP}) catch syscall 252 +Catchpoint 1 (syscall(s) 'exit_group') +(@value{GDBP}) r +Starting program: /tmp/catch-syscall + +Catchpoint 1 (call to syscall 'exit_group'), \ + 0xffffe424 in __kernel_vsyscall () +(@value{GDBP}) c +Continuing. + +Program exited normally. +(@value{GDBP}) +@end smallexample + + + +If you configure @value{GDBN} using the @samp{--without-expat} option, +it will not be able to display syscall names. Also, if your +architecture does not have an XML file describing its system calls, +you will not be able to see the syscall names. It is important to +notice that these two features are used for accessing the syscall +name database. In either case, you will see a warning like this: + +@smallexample +(@value{GDBP}) catch syscall +warning: Could not open "syscalls/i386-linux.xml" +warning: Could not load the syscall XML file 'syscalls/i386-linux.xml'. +GDB will not be able to display syscall names. +Catchpoint 1 (syscall) +(@value{GDBP}) +@end smallexample + +Of course, the file name will change depending on your architecture and sy= stem. + +Still using the example above, you can also try to catch a syscall by its +number. In this case, you would see something like: + +@smallexample +(@value{GDBP}) catch syscall 252 +Catchpoint 1 (syscall(s) 252) +@end smallexample + +Again, in this case @value{GDBN} would not be able to display syscall's na= mes. + @item fork A call to @code{fork}. This is currently only available for HP-UX and @sc{gnu}/Linux. diff --git a/gdb/main.c b/gdb/main.c index 86607d3..6c7acf5 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -64,6 +64,9 @@ int dbx_commands =3D 0; /* System root path, used to find libraries etc. */ char *gdb_sysroot =3D 0; =20 +/* GDB datadir, used to store data files. */ +char *data_directory =3D 0; + struct ui_file *gdb_stdout; struct ui_file *gdb_stderr; struct ui_file *gdb_stdlog; @@ -359,6 +362,39 @@ captured_main (void *data) } } =20 +#ifdef DATA_DIRECTORY_RELOCATABLE + data_directory =3D make_relative_prefix (argv[0], BINDIR, DATA_DIRECTORY= ); + if (data_directory) + { + struct stat s; + int res =3D 0; + + if (stat (data_directory, &s) =3D=3D 0) + if (S_ISDIR (s.st_mode)) + res =3D 1; + + if (res =3D=3D 0) + { + xfree (data_directory); + data_directory =3D xstrdup (DATA_DIRECTORY); + } + } + else + data_directory =3D xstrdup (DATA_DIRECTORY); +#else + data_directory =3D xstrdup (DATA_DIRECTORY); +#endif /* DATA_DIRECTORY_RELOCATABLE */ + + /* Canonicalize the GDB's datadir path. */ + if (*data_directory) + { + char *canon_debug =3D lrealpath (data_directory); + if (canon_debug) + { + xfree (data_directory); + data_directory =3D canon_debug; + } + } get_init_files (&system_gdbinit, &home_gdbinit, &local_gdbinit); =20 #ifdef RELOC_SRCDIR diff --git a/gdb/maint.c b/gdb/maint.c index 56cafe9..69beff9 100644 --- a/gdb/maint.c +++ b/gdb/maint.c @@ -906,4 +906,12 @@ When enabled GDB is profiled."), show_maintenance_profile_p, &maintenance_set_cmdlist, &maintenance_show_cmdlist); + add_setshow_filename_cmd ("data-directory", class_maintenance, + &data_directory, _("Set GDB's data directory pa= th."), + _("Show GDB's data directory path."), + _("\ +When set, GDB uses the specified path to search for data files."), + NULL, NULL, + &maintenance_set_cmdlist, + &maintenance_show_cmdlist); } diff --git a/gdb/testsuite/gdb.base/Makefile.in b/gdb/testsuite/gdb.base/Ma= kefile.in index 9f382db..12db521 100644 --- a/gdb/testsuite/gdb.base/Makefile.in +++ b/gdb/testsuite/gdb.base/Makefile.in @@ -12,7 +12,7 @@ EXECUTABLES =3D all-types annota1 bitfields break \ scope section_command setshow setvar shmain sigall signals \ solib solib_sl so-impl-ld so-indr-cl \ step-line step-test structs structs2 \ - twice-tmp varargs vforked-prog watchpoint whatis + twice-tmp varargs vforked-prog watchpoint whatis catch-syscall =20 MISCELLANEOUS =3D coremmap.data ../foobar.baz \ shr1.sl shr2.sl solib_sl.sl solib1.sl solib2.sl diff --git a/gdb/testsuite/gdb.base/catch-syscall.c b/gdb/testsuite/gdb.bas= e/catch-syscall.c new file mode 100644 index 0000000..64850de --- /dev/null +++ b/gdb/testsuite/gdb.base/catch-syscall.c @@ -0,0 +1,25 @@ +/* This file is used to test the 'catch syscall' feature on GDB. +=20 + Please, if you are going to edit this file DO NOT change the syscalls + being called (nor the order of them). If you really must do this, then + take a look at catch-syscall.exp and modify there too. + + Written by Sergio Durigan Junior + September, 2008 */ + +#include +#include +#include + +int +main (void) +{ + /* A close() with a wrong argument. We are only + interested in the syscall. */ + close (-1); + + chroot ("."); + + /* The last syscall. Do not change this. */ + _exit (0); +} diff --git a/gdb/testsuite/gdb.base/catch-syscall.exp b/gdb/testsuite/gdb.b= ase/catch-syscall.exp new file mode 100644 index 0000000..ac529c6 --- /dev/null +++ b/gdb/testsuite/gdb.base/catch-syscall.exp @@ -0,0 +1,431 @@ +# Copyright 1997, 1999, 2007, 2008 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 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 . + + +# This program tests the 'catch syscall' functionality. +# +# It was written by Sergio Durigan Junior +# on September/2008. + +if { [is_remote target] || ![isnative] } then { + continue +} + +set prms_id 0 +set bug_id 0 + +global srcfile +set testfile "catch-syscall" +set srcfile ${testfile}.c +set binfile ${objdir}/${subdir}/${testfile} + +# All (but the last) syscalls from the example code +# They are ordered according to the file, so do not change this. +set all_syscalls { "close" "chroot" } +# The last syscall (exit()) does not return, so +# we cannot expect the catchpoint to be triggered +# twice. It is a special case. +set last_syscall "exit_group" + +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executabl= e {debug}] !=3D "" } { + untested catch-syscall.exp + return -1 +} + +# Until "catch syscall" is implemented on other targets... +if {![istarget "hppa*-hp-hpux*"] && ![istarget "*-linux*"]} then { + continue +} + +# This shall be updated whenever 'catch syscall' is implemented +# on some architecture. +#if { ![istarget "x86_64-*-linux*"] && ![istarget "i\[34567\]86-*-linux*"] +if { ![istarget "i\[34567\]86-*-linux*"] + && ![istarget "powerpc-*-linux*"] && ![istarget "powerpc64-*-linux*"]= } { + continue +} + +# Internal procedure used to check if, after issuing a 'catch syscall' +# command (without arguments), the 'info breakpoints' command displays +# that '"any syscall"' is to be caught. +proc check_info_bp_any_syscall {} { + global gdb_prompt + + # Verifying that the catchpoint appears in the 'info breakpoints' + # command, but with "". + set thistest "catch syscall appears in 'info breakpoints'" + gdb_test "info breakpoints" ".*catchpoint.*keep y.*syscall\[(\]s\[)\] = \"\".*" $thistest +} + +# Internal procedure used to check if, after issuing a 'catch syscall X' +# command (with arguments), the 'info breakpoints' command displays +# that the syscall 'X' is to be caught. +proc check_info_bp_specific_syscall { syscall } { + global gdb_prompt + + set thistest "syscall(s) $syscall appears in 'info breakpoints'" + gdb_test "info breakpoints" ".*catchpoint.*keep y.*syscall\[(\]s\[)\] = (.)?${syscall}(.)?.*" $thistest +} + +# Internal procedure used to check if, after issuing a 'catch syscall X' +# command (with many arguments), the 'info breakpoints' command displays +# that the syscalls 'X' are to be caught. +proc check_info_bp_many_syscalls { syscalls } { + global gdb_prompt + set filter_str "" + + foreach name $syscalls { + set filter_str "${filter_str}${name}, " + } + + set filter_str [ string trimright $filter_str ", " ] + + set thistest "syscalls $filter_str appears in 'info breakpoints'" + gdb_test "info breakpoints" ".*catchpoint.*keep y.*syscall\[(\]s\[)\] = (.)?${filter_str}(.)?.*" $thistest +} + +# This procedure checks if there was a call to a syscall. +proc check_call_to_syscall { syscall } { + global gdb_prompt + + set thistest "program has called $syscall" + gdb_test "continue" "Catchpoint .*(call to syscall .?${syscall}.?).*" = $thistest +} + +# This procedure checks if the syscall returned. +proc check_return_from_syscall { syscall } { + global gdb_prompt + + set thistest "syscall $syscall has returned" + gdb_test "continue" "Catchpoint .*(returned from syscall (.)?${syscall= }(.)?).*" $thistest +} + +# Internal procedure that performs two 'continue' commands and checks if +# a syscall call AND return occur. +proc check_continue { syscall } { + global gdb_prompt + + # Testing if the 'continue' stops at the + # specified syscall_name. If it does, then it should + # first print that the infeior has called the syscall, + # and after print that the syscall has returned. + + # Testing if the inferiorr has called the syscall. + check_call_to_syscall $syscall + # And now, that the syscall has returned. + check_return_from_syscall $syscall +} + +# Inserts a syscall catchpoint with an argument. +proc insert_catch_syscall_with_arg { syscall } { + global gdb_prompt + + # Trying to set the catchpoint + set thistest "catch syscall with arguments ($syscall)" + gdb_test "catch syscall $syscall" "Catchpoint .*(syscall\[(\]s\[)\] (.= )?${syscall}(.)?).*" $thistest + + check_info_bp_specific_syscall $syscall +} + +# Inserts a syscall catchpoint with many arguments. +proc insert_catch_syscall_with_many_args { syscalls } { + global gdb_prompt + set catch [ join $syscalls " " ] + set filter_str "" + + foreach name $syscalls { + set filter_str "${filter_str}'${name}' " + } + + set filter_str [ string trimright $filter_str " " ] + + # Trying to set the catchpoint + set thistest "catch syscall with arguments ($filter_str)" + gdb_test "catch syscall $catch" "Catchpoint .*(syscall\[(\]s\[)\] (.)?= ${filter_str}(.)?).*" $thistest + + check_info_bp_many_syscalls $syscalls +} + +proc check_for_program_end {} { + global gdb_prompt + + # Deleting the catchpoints + delete_breakpoints + + set thistest "successful program end" + gdb_test "continue" "Program exited normally.*" $thistest + +} + +proc test_catch_syscall_without_args {} { + global gdb_prompt all_syscalls last_syscall + + # Trying to set the syscall + set thistest "setting catch syscall without arguments" + gdb_test "catch syscall" "Catchpoint .*(syscall).*" $thistest + + check_info_bp_any_syscall + + # We have to check every syscall + foreach name $all_syscalls { + check_continue $name + } + + # At last but not least, we check if the inferior + # has called the last (exit) syscall. + check_call_to_syscall $last_syscall + + # Now let's see if the inferior correctly finishes. + check_for_program_end +} + +proc test_catch_syscall_with_args {} { + global gdb_prompt + set syscall_name "close" + + insert_catch_syscall_with_arg $syscall_name=20 + + # Can we continue until we catch the syscall? + check_continue $syscall_name + + # Now let's see if the inferior correctly finishes. + check_for_program_end +} + +proc test_catch_syscall_with_many_args {} { + global gdb_prompt all_syscalls + + insert_catch_syscall_with_many_args $all_syscalls + + # Can we continue until we catch the syscalls? + foreach name $all_syscalls { + check_continue $name + } + + # Now let's see if the inferior correctly finishes. + check_for_program_end +} + +proc test_catch_syscall_with_wrong_args {} { + global gdb_prompt + # mlock is not called from the source + set syscall_name "mlock" + + insert_catch_syscall_with_arg $syscall_name + + # Now, we must verify if the program stops with a continue. + # If it doesn't, everything is right (since we don't have + # a syscall named "mlock" in it). Otherwise, this is a failure. + set thistest "catch syscall with unused syscall ($syscall_name)" + gdb_test "continue" "Program exited normally.*" $thistest +} + +proc test_catch_syscall_restarting_inferior {} { + global gdb_prompt + set syscall_name "chroot" + + insert_catch_syscall_with_arg $syscall_name + + # Let's first reach the call of the syscall. + check_call_to_syscall $syscall_name + + # Now, restart the program + rerun_to_main + + # And check for call/return + check_continue $syscall_name + + # Can we finish? + check_for_program_end +} + +proc do_syscall_tests {} { + global gdb_prompt srcdir + + # First, we need to set GDB datadir. + send_gdb "maintenance set data-directory $srcdir/..\n" + gdb_expect 10 { + -re "$gdb_prompt $" { + verbose "Setting GDB datadir to $srcdir/..." 2 + } + timeout { + error "Couldn't set GDB datadir." + } + } + + # Verify that the 'catch syscall' help is available + set thistest "help catch syscall" + gdb_test "help catch syscall" "Catch system calls.*" $thistest + + # Try to set a catchpoint to a nonsense syscall + set thistest "catch syscall to a nonsense syscall is prohibited" + gdb_test "catch syscall nonsense_syscall" "Unknown syscall name .*" $t= histest + + # Testing the 'catch syscall' command without arguments. + # This test should catch any syscalls. + if [runto_main] then { test_catch_syscall_without_args } + + # Testing the 'catch syscall' command with arguments. + # This test should only catch the specified syscall. + if [runto_main] then { test_catch_syscall_with_args } + + # Testing the 'catch syscall' command with many arguments. + # This test should catch $all_syscalls. + if [runto_main] then { test_catch_syscall_with_many_args } + + # Testing the 'catch syscall' command with WRONG arguments. + # This test should not trigger any catchpoints. + if [runto_main] then { test_catch_syscall_with_wrong_args } + + # Testing the 'catch' syscall command during a restart of + # the inferior. + if [runto_main] then { test_catch_syscall_restarting_inferior } +} + +proc test_catch_syscall_fail_noxml {} { + global gdb_prompt + + # Sanitizing. + delete_breakpoints + + # Testing to see if we receive a warning when calling "catch syscall" + # without XML support. + set thistest "Catch syscall displays a warning when there is no XML su= pport" + gdb_test "catch syscall" "warning: Could not open .*warning: Could not= load the syscall XML file .*GDB will not be able to display syscall names.= *Catchpoint .*(syscall).*" $thistest + + # Since the catchpoint was set, we must check if it's present at + # "info breakpoints" + check_info_bp_any_syscall + + # Sanitizing. + delete_breakpoints +} + +proc test_catch_syscall_without_args_noxml {} { + # We will need the syscall names even not using it + # because we need to know know many syscalls are in + # the example file. + global gdb_prompt all_syscalls last_syscall + + delete_breakpoints + + set thistest "Catch syscall without arguments and without XML support" + gdb_test "catch syscall" "Catchpoint .*(syscall).*" + + # Now, we should be able to set a catchpoint, + # and GDB shall not display the warning anymore. + foreach name $all_syscalls { + # Unfortunately, we don't know the syscall number + # that will be caught because this information is + # arch-dependent. Thus, we try to catch anything + # similar to a number. + check_continue "\[0-9\]*" + } + + # At last but not least, we check if the inferior + # has called the last (exit) syscall. + check_call_to_syscall "\[0-9\]*" + + delete_breakpoints +} + +proc test_catch_syscall_with_args_noxml {} { + global gdb_prompt + + # The number of the "close" syscall. This is our + # options for a "long-estabilished" syscall in all + # Linux architectures, but unfortunately x86_64 and + # a few other platforms don't "follow the convention". + # Because of this, we need this ugly check :-(. + set close_number "" + if { [istarget "x86_64-*-linux*"] } { + set close_number "3" + } else { + set close_number "6" + } + + delete_breakpoints + + insert_catch_syscall_with_arg $close_number + + check_continue $close_number + + delete_breakpoints +} + +proc test_catch_syscall_with_wrong_args_noxml {} { + global gdb_prompt + + delete_breakpoints + + # Even without XML support, GDB should not accept unknown + # syscall names for the catchpoint. + set thistest "Catch a nonsense syscall without XML support" + gdb_test "catch syscall nonsense_syscall" "Unknown syscall name .nonse= nse_syscall.*" $thistest + + delete_breakpoints +} + +proc do_syscall_tests_without_xml {} { + global gdb_prompt srcdir + + # In this case, we don't need to set GDB's datadir because + # we want GDB to display only numbers, not names. So, let's + # begin with the tests. + + # The first test is to see if GDB displays a warning when we + # try to catch syscalls without the XML support. + test_catch_syscall_fail_noxml + + # Now, let's test if we can catch syscalls without XML support. + # We should succeed, but GDB is not supposed to print syscall names. + if [runto_main] then { test_catch_syscall_without_args_noxml } + + # The only valid argument "catch syscall" should accept is the + # syscall number, and not the name (since it can't translate a + # name to a number). + # + # It's worth mentioning that we only try to catch the syscall + # close(). This is because the syscall number is an arch-dependent + # information, so we can't assume that we know every syscall number + # in this system. Therefore, we have decided to use a "long-estabilis= hed" + # system call, and close() just sounded the right choice :-). + if [runto_main] then { test_catch_syscall_with_args_noxml } + + # Now, we'll try to provide a syscall name (valid or not) to the comma= nd, + # and expect it to fail. + if [runto_main] then { test_catch_syscall_with_wrong_args_noxml } +} + +# Start with a fresh gdb + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +# Execute the tests, using XML support +do_syscall_tests + +# Restart gdb + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +# Execute the tests, without XML support. In this case, GDB will +# only display syscall numbers, and not syscall names. +do_syscall_tests_without_xml --=-VIC3koeFw/4M7DHukryS--