diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile index 0b655b498f2d..8edd9cfd3b9b 100644 --- a/devel/gdb/Makefile +++ b/devel/gdb/Makefile @@ -1,191 +1,193 @@ PORTNAME= gdb -DISTVERSION= 13.2 -PORTREVISION= 2 +DISTVERSION= 14.1 CATEGORIES= devel MASTER_SITES= GNU MAINTAINER= pizzamig@FreeBSD.org COMMENT= GNU Project Debugger WWW= https://www.gnu.org/software/gdb/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING3 LIB_DEPENDS= libexpat.so:textproc/expat2 \ libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libzstd.so:archivers/zstd TEST_DEPENDS= runtest:misc/dejagnu USES= compiler:c++11-lang cpe gmake libtool makeinfo pkgconfig tar:xz USE_PYTHON= flavors py3kplist TEST_TARGET= check CPE_VENDOR= gnu GNU_CONFIGURE= yes CONFIGURE_ENV= CONFIGURED_M4=m4 CONFIGURED_BISON=byacc -CONFIGURE_ARGS= --program-suffix=${DISTVERSION:S/.//g} \ +CONFIGURE_ARGS= --program-suffix=${VER} \ + --disable-sim \ --enable-targets=all --enable-64-bit-bfd \ --with-separate-debug-dir=/usr/lib/debug \ ${ICONV_CONFIGURE_ARG} \ --without-libunwind-ia64 CONFIGURE_OUTSOURCE= yes CFLAGS:= ${CFLAGS:C/ +$//} # blanks at EOL creep in sometimes CFLAGS+= -DRL_NO_COMPAT -EXCLUDE= dejagnu expect sim texinfo intl +EXCLUDE= dejagnu expect texinfo intl EXTRACT_AFTER_ARGS= ${EXCLUDE:S/^/--exclude /} VER= ${DISTVERSION:S/.//g} PLIST_SUB= VER=${VER} OPTIONS_DEFINE= DEBUGINFOD GDB_LINK GUILE KGDB NLS PYTHON \ SOURCE_HIGHLIGHT TUI XXHASH OPTIONS_DEFAULT= GDB_LINK KGDB NLS PYTHON SOURCE_HIGHLIGHT \ TUI XXHASH OPTIONS_DEFAULT+= PORT_READLINE PORT_ICONV SYSTEM_ZLIB OPTIONS_SINGLE= READLINE ICONV ZLIB OPTIONS_SINGLE_READLINE= BUNDLED_READLINE PORT_READLINE OPTIONS_SINGLE_ICONV= PORT_ICONV SYSTEM_ICONV OPTIONS_SINGLE_ZLIB= BUNDLED_ZLIB SYSTEM_ZLIB DEBUGINFOD_DESC= Build gdb with debuginfod server support GDB_LINK_DESC= Create ${PREFIX}/bin/gdb symlink KGDB_DESC= Kernel debugging support BUNDLED_READLINE_DESC= from gdb distfile BUNDLED_ZLIB_DESC= from gdb distfile PORT_READLINE_DESC= from devel/readline port PORT_ICONV_DESC= use libiconv, with wider charset support SOURCE_HIGHLIGHT_DESC= Syntax highlighting support SYSTEM_ICONV_DESC= use libc iconv, with no wchar support SYSTEM_ZLIB_DESC= use system zlib TUI_DESC= Text User Interface support XXHASH_DESC= Use xxHash for hashing (faster) OPTIONS_SUB= yes BUNDLED_READLINE_CONFIGURE_OFF= --with-system-readline DEBUGINFOD_CONFIGURE_WITH= debuginfod DEBUGINFOD_LIB_DEPENDS= libdebuginfod.so:devel/elfutils GUILE_CONFIGURE_WITH= guile=guile-${GUILE_VER} GUILE_USES= guile:2.2,3.0 NLS_USES= gettext-runtime PORT_READLINE_USES= readline PORT_ICONV_USES= iconv:wchar_t PYTHON_CONFIGURE_ON= --with-python=${PYTHON_CMD} PYTHON_CONFIGURE_OFF= --without-python PYTHON_USES= python SOURCE_HIGHLIGHT_CONFIGURE_ENABLE= source-highlight SOURCE_HIGHLIGHT_LIB_DEPENDS= \ libsource-highlight.so:textproc/source-highlight SYSTEM_ICONV_USES= iconv SYSTEM_ZLIB_CONFIGURE_WITH= system-zlib TUI_CONFIGURE_ENABLE= tui XXHASH_CONFIGURE_OFF= --with-xxhash=no XXHASH_LIB_DEPENDS= libxxhash.so:devel/xxhash +ALL_TARGET= all-gdb + .include .if ${PORT_OPTIONS:MPYTHON} .if ${PYTHON_VER} != ${PYTHON_DEFAULT} PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} .endif .endif .if ${PORT_OPTIONS:MPYTHON} && \ (exists(/usr/lib/libc++.so.1) || exists(/lib/libc++.so.1)) USE_GITHUB= nodefault GH_ACCOUNT= bsdjhb:libcxx GH_PROJECT= libcxx-gdbpy:libcxx GH_TAGNAME= 03d0d9b:libcxx # Workaround USE_GITHUB preventing the default DISTFILES DISTFILES= ${DISTNAME}${EXTRACT_SUFX} .if exists(/usr/lib/libc++.so.1) LIBCXX_DIR= /usr/lib .else LIBCXX_DIR= /lib .endif PLIST_SUB+= LIBCXX_DIR="${LIBCXX_DIR}" PLIST_SUB+= LIBCXX="" .else PLIST_SUB+= LIBCXX="@comment " .endif .if ! ${PORT_OPTIONS:MBUNDLED_ZLIB} EXCLUDE+= zlib .endif .if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} .endif post-patch: @${REINPLACE_CMD} -e 's|$$| [GDB v${DISTVERSION} for FreeBSD]|' \ ${WRKSRC}/gdb/version.in post-patch-KGDB-on: @${CP} -r ${FILESDIR}/kgdb/*.[ch] ${WRKSRC}/gdb/ @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} < ${FILESDIR}/extrapatch-kgdb do-install: ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/gdb/gdb \ ${STAGEDIR}${PREFIX}/bin/gdb${VER} ${INSTALL_MAN} ${WRKSRC}/gdb/doc/gdb.1 \ ${STAGEDIR}${PREFIX}/share/man/man1/gdb${VER}.1 (cd ${INSTALL_WRKSRC}/gdb/data-directory ; \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-syscalls ) do-install-KGDB-on: ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/gdb/kgdb \ ${STAGEDIR}${PREFIX}/bin/kgdb${VER} ${INSTALL_MAN} ${FILESDIR}/kgdb/kgdb.1 \ ${STAGEDIR}${PREFIX}/share/man/man1/kgdb${VER}.1 do-install-TUI-on: ${LN} -sf gdb${VER} ${STAGEDIR}${PREFIX}/bin/gdbtui${VER} do-install-GDB_LINK-on: ${LN} -sf gdb${VER} ${STAGEDIR}${PREFIX}/bin/gdb ${LN} -sf gdb${VER}.1 ${STAGEDIR}${PREFIX}/share/man/man1/gdb.1 .if ${PORT_OPTIONS:MKGDB} ${LN} -sf kgdb${VER} ${STAGEDIR}${PREFIX}/bin/kgdb ${LN} -sf kgdb${VER}.1 ${STAGEDIR}${PREFIX}/share/man/man1/kgdb.1 .endif do-install-PYTHON-on: (cd ${INSTALL_WRKSRC}/gdb ; \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-python ) (cd ${INSTALL_WRKSRC}/gdb/data-directory ; \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-python ) @(cd ${STAGEDIR}${PREFIX}/share/gdb/python && \ ${PYTHON_CMD} -m compileall .) . for f in gdb gdb/command gdb/function gdb/printer @(cd ${STAGEDIR}${PREFIX}/share/gdb/python/${f} ; ${CHMOD} 644 *.py* ) . endfor .if exists(/usr/lib/libc++.so.1) || exists(/lib/libc++.so.1) @(cd ${WRKSRC_libcxx} ; \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} \ LIBCXX_DIR="${LIBCXX_DIR}" install ) @(cd ${STAGEDIR}${PREFIX}/share/gdb/auto-load/${LIBCXX_DIR} && \ ${PYTHON_CMD} -m compileall .) @(cd ${STAGEDIR}${PREFIX}/share/libcxx-gdbpy/libcxx && \ ${PYTHON_CMD} -m compileall .) .endif # DO NOT try and add rules here to strip .go files, no matter how loudly # testport / stage-qa shouts at you about it, because .go files (which are # compiled bytecode) are not intended to be stripped and doing so causes # breakage at run time. do-install-GUILE-on: (cd ${INSTALL_WRKSRC}/gdb ; \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-guile ) (cd ${INSTALL_WRKSRC}/gdb/data-directory ; \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-guile ) .include diff --git a/devel/gdb/distinfo b/devel/gdb/distinfo index c99153cc7305..95fd730add1c 100644 --- a/devel/gdb/distinfo +++ b/devel/gdb/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1691332214 -SHA256 (gdb-13.2.tar.xz) = fd5bebb7be1833abdb6e023c2f498a354498281df9d05523d8915babeb893f0a -SIZE (gdb-13.2.tar.xz) = 23664644 +TIMESTAMP = 1702493574 +SHA256 (gdb-14.1.tar.xz) = d66df51276143451fcbff464cc8723d68f1e9df45a6a2d5635a54e71643edb80 +SIZE (gdb-14.1.tar.xz) = 24108624 SHA256 (bsdjhb-libcxx-gdbpy-03d0d9b_GH0.tar.gz) = 2c1563f361d4fb59b54b1b39bff5cdf609d73962758eb05a8cdfe2c22551b259 SIZE (bsdjhb-libcxx-gdbpy-03d0d9b_GH0.tar.gz) = 6052 diff --git a/devel/gdb/files/commit-a980a7d24b9 b/devel/gdb/files/commit-a980a7d24b9 deleted file mode 100644 index f818c93fa4a6..000000000000 --- a/devel/gdb/files/commit-a980a7d24b9 +++ /dev/null @@ -1,37 +0,0 @@ -commit a980a7d24b9ab416a70880182d4e6b4975967d38 -Author: John Baldwin -Date: Fri Mar 10 12:01:40 2023 -0800 - - PR gdb/30214: Prefer local include paths to system include paths - - Some systems may install binutils headers into a system location - (e.g. /usr/local/include on FreeBSD) which may also include headers - for other external packages used by GDB such as zlib or zstd. If a - system include path such as /usr/local/include is added before local - include paths to directories within a clone or release tarball, then - headers from the external binutils package are used which can result - in build failures if the external binutils package is out of sync with - the version of GDB being built. - - To fix, sort the include paths in INTERNAL_CFLAGS_BASE to add CFLAGS - for "local" componenets before external components. - - Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30214 - Reviewed-By: Tom Tromey - (cherry picked from commit a2fbb6903889c8fe32f4f3b890ef4b8c565d6b84) - -diff --git gdb/Makefile.in gdb/Makefile.in -index 321a58c4635..fa7c81a0fab 100644 ---- gdb/Makefile.in -+++ gdb/Makefile.in -@@ -629,8 +629,8 @@ INTERNAL_CPPFLAGS = $(CPPFLAGS) @GUILE_CPPFLAGS@ @PYTHON_CPPFLAGS@ \ - # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros. - INTERNAL_CFLAGS_BASE = \ - $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \ -- $(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) $(ZLIBINC) \ -- $(ZSTD_CFLAGS) $(BFD_CFLAGS) $(INCLUDE_CFLAGS) $(LIBDECNUMBER_CFLAGS) \ -+ $(GDB_CFLAGS) $(OPCODES_CFLAGS) $(BFD_CFLAGS) $(INCLUDE_CFLAGS) \ -+ $(READLINE_CFLAGS) $(ZLIBINC) $(ZSTD_CFLAGS) $(LIBDECNUMBER_CFLAGS) \ - $(INTL_CFLAGS) $(INCGNU) $(INCSUPPORT) $(LIBBACKTRACE_INC) \ - $(ENABLE_CFLAGS) $(INTERNAL_CPPFLAGS) $(SRCHIGH_CFLAGS) \ - $(TOP_CFLAGS) $(PTHREAD_CFLAGS) $(DEBUGINFOD_CFLAGS) diff --git a/devel/gdb/files/commit-ae61525fcf4 b/devel/gdb/files/commit-ae61525fcf4 deleted file mode 100644 index 202f695b654c..000000000000 --- a/devel/gdb/files/commit-ae61525fcf4 +++ /dev/null @@ -1,128 +0,0 @@ -commit ae61525fcf456ab395d55c45492a106d1275873a -Author: Simon Marchi -Date: 2023-02-23 12:35:40 -0500 - - gdbsupport: ignore -Wenum-constexpr-conversion in enum-flags.h - - When building with clang 16, we get: - - CXX gdb.o - In file included from /home/smarchi/src/binutils-gdb/gdb/gdb.c:19: - In file included from /home/smarchi/src/binutils-gdb/gdb/defs.h:65: - /home/smarchi/src/binutils-gdb/gdb/../gdbsupport/enum-flags.h:95:52: error: integer value -1 is outside the valid range of values [0, 15] for this enumeration type [-Wenum-constexpr-conversion] - integer_for_size(T (-1) < T (0))>::type - ^ - - The error message does not make it clear in the context of which enum - flag this fails (i.e. what is T in this context), but it doesn't really - matter, we have similar warning/errors for many of them, if we let the - build go through. - - clang is right that the value -1 is invalid for the enum type we cast -1 - to. However, we do need this expression in order to select an integer - type with the appropriate signedness. That is, with the same signedness - as the underlying type of the enum. - - I first wondered if that was really needed, if we couldn't use - std::underlying_type for that. It turns out that the comment just above - says: - - /* Note that std::underlying_type is not what we want here, - since that returns unsigned int even when the enum decays to signed - int. */ - - I was surprised, because std::is_signed> - returns the right thing. So I tried replacing all this with - std::underlying_type, see if that would work. Doing so causes some - build failures in unittests/enum-flags-selftests.c: - - CXX unittests/enum-flags-selftests.o - /home/smarchi/src/binutils-gdb/gdb/unittests/enum-flags-selftests.c:254:1: error: static assertion failed due to requirement 'gdb::is_same, selftests::enum_flags_tests::RE, enum_flags, selftests::enum_flags_tests::RE2, enum_flags, selftests::enum_fla - gs_tests::URE, int>, selftests::enum_flags_tests::check_valid_expr254::archetype, selftests::enum_flags_tests::RE, enum_flags, selfte - sts::enum_flags_tests::RE2, enum_flags, selftests::enum_flags_tests::URE, unsigned int>>::value == true': - CHECK_VALID (true, int, true ? EF () : EF2 ()) - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - /home/smarchi/src/binutils-gdb/gdb/unittests/enum-flags-selftests.c:91:3: note: expanded from macro 'CHECK_VALID' - CHECK_VALID_EXPR_6 (EF, RE, EF2, RE2, UEF, URE, VALID, EXPR_TYPE, EXPR) - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - /home/smarchi/src/binutils-gdb/gdb/../gdbsupport/valid-expr.h:105:3: note: expanded from macro 'CHECK_VALID_EXPR_6' - CHECK_VALID_EXPR_INT (ESC_PARENS (typename T1, typename T2, \ - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - /home/smarchi/src/binutils-gdb/gdb/../gdbsupport/valid-expr.h:66:3: note: expanded from macro 'CHECK_VALID_EXPR_INT' - static_assert (gdb::is_detected_exact, \ - ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - This is a bit hard to decode, but basically enumerations have the - following funny property that they decay into a signed int, even if - their implicit underlying type is unsigned. This code: - - enum A {}; - enum B {}; - - int main() { - std::cout << std::is_signed::type>::value - << std::endl; - std::cout << std::is_signed::type>::value - << std::endl; - auto result = true ? A() : B(); - std::cout << std::is_signed::value << std::endl; - } - - produces: - - 0 - 0 - 1 - - So, the "CHECK_VALID" above checks that this property works for enum flags the - same way as it would if you were using their underlying enum types. And - somehow, changing integer_for_size to use std::underlying_type breaks that. - - Since the current code does what we want, and I don't see any way of doing it - differently, ignore -Wenum-constexpr-conversion around it. - - Change-Id: Ibc82ae7bbdb812102ae3f1dd099fc859dc6f3cc2 - -diff --git gdbsupport/enum-flags.h gdbsupport/enum-flags.h -index 700037f6126..41ac7838f06 100644 ---- gdbsupport/enum-flags.h -+++ gdbsupport/enum-flags.h -@@ -91,9 +91,12 @@ template<> struct integer_for_size<8, 1> { typedef int64_t type; }; - template - struct enum_underlying_type - { -+ DIAGNOSTIC_PUSH -+ DIAGNOSTIC_IGNORE_ENUM_CONSTEXPR_CONVERSION - typedef typename - integer_for_size(T (-1) < T (0))>::type - type; -+ DIAGNOSTIC_POP - }; - - namespace enum_flags_detail -diff --git include/diagnostics.h include/diagnostics.h -index d3ff27bc008..41e6db65391 100644 ---- include/diagnostics.h -+++ include/diagnostics.h -@@ -76,6 +76,11 @@ - # define DIAGNOSTIC_ERROR_SWITCH \ - DIAGNOSTIC_ERROR ("-Wswitch") - -+# if __has_warning ("-Wenum-constexpr-conversion") -+# define DIAGNOSTIC_IGNORE_ENUM_CONSTEXPR_CONVERSION \ -+ DIAGNOSTIC_IGNORE ("-Wenum-constexpr-conversion") -+# endif -+ - #elif defined (__GNUC__) /* GCC */ - - # define DIAGNOSTIC_IGNORE_DEPRECATED_DECLARATIONS \ -@@ -155,4 +160,8 @@ - # define DIAGNOSTIC_ERROR_SWITCH - #endif - -+#ifndef DIAGNOSTIC_IGNORE_ENUM_CONSTEXPR_CONVERSION -+# define DIAGNOSTIC_IGNORE_ENUM_CONSTEXPR_CONVERSION -+#endif -+ - #endif /* DIAGNOSTICS_H */ diff --git a/devel/gdb/files/extrapatch-kgdb b/devel/gdb/files/extrapatch-kgdb index 6d8e6fb9924a..f9098cc19de8 100644 --- a/devel/gdb/files/extrapatch-kgdb +++ b/devel/gdb/files/extrapatch-kgdb @@ -1,525 +1,605 @@ diff --git gdb/Makefile.in gdb/Makefile.in -index 321a58c4635..57a45c391ef 100644 +index 9c0a0bff2cd..0e62786dd31 100644 --- gdb/Makefile.in +++ gdb/Makefile.in -@@ -696,6 +696,7 @@ TARGET_OBS = @TARGET_OBS@ +@@ -704,6 +704,7 @@ ALL_AMD_DBGAPI_TARGET_OBS = \ # All target-dependent objects files that require 64-bit CORE_ADDR # (used with --enable-targets=all --enable-64-bit-bfd). ALL_64_TARGET_OBS = \ + aarch64-fbsd-kern.o \ aarch64-fbsd-tdep.o \ aarch64-linux-tdep.o \ aarch64-newlib-tdep.o \ -@@ -710,6 +711,7 @@ ALL_64_TARGET_OBS = \ +@@ -718,6 +719,7 @@ ALL_64_TARGET_OBS = \ amd64-darwin-tdep.o \ amd64-dicos-tdep.o \ amd64-fbsd-tdep.o \ + amd64fbsd-kern.o \ amd64-linux-tdep.o \ amd64-netbsd-tdep.o \ amd64-obsd-tdep.o \ -@@ -728,18 +730,21 @@ ALL_64_TARGET_OBS = \ +@@ -737,18 +739,21 @@ ALL_64_TARGET_OBS = \ ia64-vms-tdep.o \ loongarch-linux-tdep.o \ loongarch-tdep.o \ + mipsfbsd-kern.o \ mips-fbsd-tdep.o \ mips-linux-tdep.o \ mips-netbsd-tdep.o \ mips-sde-tdep.o \ mips-tdep.o \ mips64-obsd-tdep.o \ + riscv-fbsd-kern.o \ riscv-fbsd-tdep.o \ riscv-linux-tdep.o \ riscv-none-tdep.o \ riscv-ravenscar-thread.o \ riscv-tdep.o \ sparc64-fbsd-tdep.o \ + sparc64fbsd-kern.o \ sparc64-linux-tdep.o \ sparc64-netbsd-tdep.o \ sparc64-obsd-tdep.o \ -@@ -764,6 +769,7 @@ ALL_TARGET_OBS = \ +@@ -773,6 +778,7 @@ ALL_TARGET_OBS = \ arch/loongarch.o \ arch/ppc-linux-common.o \ arm-bsd-tdep.o \ + arm-fbsd-kern.o \ arm-fbsd-tdep.o \ arm-linux-tdep.o \ arm-netbsd-tdep.o \ -@@ -781,6 +787,8 @@ ALL_TARGET_OBS = \ +@@ -790,6 +796,8 @@ ALL_TARGET_OBS = \ csky-linux-tdep.o \ csky-tdep.o \ dicos-tdep.o \ + fbsd-kld.o \ + fbsd-kthr.o \ fbsd-tdep.o \ frv-linux-tdep.o \ frv-tdep.o \ -@@ -795,6 +803,7 @@ ALL_TARGET_OBS = \ +@@ -804,6 +812,7 @@ ALL_TARGET_OBS = \ i386-bsd-tdep.o \ i386-darwin-tdep.o \ i386-dicos-tdep.o \ + i386fbsd-kern.o \ i386-fbsd-tdep.o \ i386-gnu-tdep.o \ i386-go32-tdep.o \ -@@ -832,6 +841,7 @@ ALL_TARGET_OBS = \ +@@ -841,6 +850,7 @@ ALL_TARGET_OBS = \ obsd-tdep.o \ or1k-linux-tdep.o \ or1k-tdep.o \ + ppcfbsd-kern.o \ ppc-fbsd-tdep.o \ ppc-linux-tdep.o \ ppc-netbsd-tdep.o \ -@@ -1622,6 +1632,7 @@ ALLDEPFILES = \ +@@ -1642,6 +1652,7 @@ ALLDEPFILES = \ arch/riscv.c \ arch/tic6x.c \ aarch32-tdep.c \ + aarch64-fbsd-kern.c \ aarch64-fbsd-nat.c \ aarch64-fbsd-tdep.c \ aarch64-linux-nat.c \ -@@ -1641,6 +1652,7 @@ ALLDEPFILES = \ +@@ -1662,6 +1673,7 @@ ALLDEPFILES = \ amd64-bsd-nat.c \ amd64-darwin-tdep.c \ amd64-dicos-tdep.c \ + amd64fbsd-kern.c \ amd64-fbsd-nat.c \ amd64-fbsd-tdep.c \ amd64-linux-nat.c \ -@@ -1656,6 +1668,7 @@ ALLDEPFILES = \ +@@ -1678,6 +1690,7 @@ ALLDEPFILES = \ arc-linux-nat.c \ arc-tdep.c \ arm-bsd-tdep.c \ + arm-fbsd-kern.c \ arm-fbsd-nat.c \ arm-fbsd-tdep.c \ arm-linux-nat.c \ -@@ -1675,6 +1688,9 @@ ALLDEPFILES = \ +@@ -1697,6 +1710,9 @@ ALLDEPFILES = \ csky-tdep.c \ darwin-nat.c \ dicos-tdep.c \ + fbsd-kld.c \ + fbsd-kthr.c \ + fbsd-kvm.c \ fbsd-nat.c \ fbsd-tdep.c \ fork-child.c \ -@@ -1695,6 +1711,7 @@ ALLDEPFILES = \ +@@ -1717,6 +1733,7 @@ ALLDEPFILES = \ i386-darwin-nat.c \ i386-darwin-tdep.c \ i386-dicos-tdep.c \ + i386fbsd-kern.c \ i386-fbsd-nat.c \ i386-fbsd-tdep.c \ i386-gnu-nat.c \ -@@ -1735,6 +1752,7 @@ ALLDEPFILES = \ +@@ -1757,6 +1774,7 @@ ALLDEPFILES = \ microblaze-linux-tdep.c \ microblaze-tdep.c \ mingw-hdep.c \ + mipsfbsd-kern.c \ mips-fbsd-nat.c \ mips-fbsd-tdep.c \ mips-linux-nat.c \ -@@ -1755,6 +1773,7 @@ ALLDEPFILES = \ +@@ -1777,6 +1795,7 @@ ALLDEPFILES = \ obsd-tdep.c \ or1k-linux-nat.c \ posix-hdep.c \ + ppcfbsd-kern.c \ ppc-fbsd-nat.c \ ppc-fbsd-tdep.c \ ppc-linux-nat.c \ -@@ -1769,6 +1788,7 @@ ALLDEPFILES = \ +@@ -1791,6 +1810,7 @@ ALLDEPFILES = \ procfs.c \ ravenscar-thread.c \ remote-sim.c \ + riscv-fbsd-kern.c \ riscv-fbsd-nat.c \ riscv-fbsd-tdep.c \ riscv-linux-nat.c \ -@@ -1805,6 +1825,7 @@ ALLDEPFILES = \ +@@ -1828,6 +1848,7 @@ ALLDEPFILES = \ sparc-sol2-nat.c \ sparc-sol2-tdep.c \ sparc-tdep.c \ + sparc64fbsd-kern.c \ sparc64-fbsd-nat.c \ sparc64-fbsd-tdep.c \ sparc64-linux-nat.c \ -@@ -1891,7 +1912,7 @@ generated_files = \ +@@ -1915,7 +1936,7 @@ generated_files = \ # Flags needed to compile Python code PYTHON_CFLAGS = @PYTHON_CFLAGS@ -all: gdb$(EXEEXT) $(CONFIG_ALL) gdb-gdb.py gdb-gdb.gdb +all: gdb$(EXEEXT) kgdb$(EXEEXT) $(CONFIG_ALL) gdb-gdb.py gdb-gdb.gdb @$(MAKE) $(FLAGS_TO_PASS) DO=all "DODIRS=$(SUBDIRS)" subdir_do # Rule for compiling .c files in the top-level gdb directory. -@@ -2154,6 +2175,12 @@ ifneq ($(CODESIGN_CERT),) +@@ -2178,6 +2199,12 @@ ifneq ($(CODESIGN_CERT),) $(ECHO_SIGN) $(CODESIGN) -s $(CODESIGN_CERT) gdb$(EXEEXT) endif -+kgdb$(EXEEXT): kgdb-main.o $(LIBGDB_OBS) $(ADD_DEPS) $(CDEPS) $(TDEPLIBS) ++kgdb$(EXEEXT): kgdb-main.o $(LIBGDB_OBS) $(CDEPS) $(TDEPLIBS) + $(SILENCE) rm -f kgdb$(EXEEXT) + $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_LDFLAGS) $(WIN32LDAPP) \ + -o kgdb$(EXEEXT) kgdb-main.o $(LIBGDB_OBS) \ + $(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS) $(LOADLIBES) + # This is useful when debugging GDB, because some Unix's don't let you run GDB # on itself without copying the executable. So "make gdb1" will make # gdb and put a copy in gdb1, and you can run it with "gdb gdb1". -@@ -2189,6 +2216,7 @@ clean mostlyclean: $(CONFIG_CLEAN) +@@ -2213,6 +2240,7 @@ clean mostlyclean: $(CONFIG_CLEAN) rm -f init.c stamp-init version.c stamp-version rm -f gdb$(EXEEXT) core make.log rm -f gdb[0-9]$(EXEEXT) + rm -f kgdb$(EXEEXT) rm -f test-cp-name-parser$(EXEEXT) rm -f xml-builtin.c stamp-xml rm -f $(DEPDIR)/* -@@ -2608,7 +2636,7 @@ endif +@@ -2636,7 +2664,7 @@ endif # A list of all the objects we might care about in this build, for # dependency tracking. -all_object_files = gdb.o $(LIBGDB_OBS) gdbtk-main.o \ +all_object_files = kgdb-main.o gdb.o $(LIBGDB_OBS) gdbtk-main.o \ test-cp-name-parser.o # All the .deps files to include. diff --git gdb/config.in gdb/config.in -index 736e6be1c48..7df4d954db0 100644 +index e17245156d8..e1be9fdbc40 100644 --- gdb/config.in +++ gdb/config.in -@@ -223,6 +223,12 @@ +@@ -229,6 +229,12 @@ /* Define to 1 if you have the `kinfo_getfile' function. */ #undef HAVE_KINFO_GETFILE +/* Define to 1 if your system has the kvm_kerndisp function. */ +#undef HAVE_KVM_DISP + +/* Define to 1 if your system has the kvm_open2 function. */ +#undef HAVE_KVM_OPEN2 + /* Define if you have and nl_langinfo(CODESET). */ #undef HAVE_LANGINFO_CODESET diff --git gdb/configure gdb/configure -index bdc84be9c01..607ee3618cc 100755 +index 5361bf42952..9f4c500fd22 100755 --- gdb/configure +++ gdb/configure -@@ -19476,6 +19476,126 @@ fi +@@ -19724,6 +19724,126 @@ fi +# kgdb needs kvm_open2 for cross-debugging +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing kvm_open2" >&5 +$as_echo_n "checking for library containing kvm_open2... " >&6; } +if ${ac_cv_search_kvm_open2+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char kvm_open2 (); +int +main () +{ +return kvm_open2 (); + ; + return 0; +} +_ACEOF +for ac_lib in '' kvm; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_kvm_open2=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_kvm_open2+:} false; then : + break +fi +done +if ${ac_cv_search_kvm_open2+:} false; then : + +else + ac_cv_search_kvm_open2=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_kvm_open2" >&5 +$as_echo "$ac_cv_search_kvm_open2" >&6; } +ac_res=$ac_cv_search_kvm_open2 +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +$as_echo "#define HAVE_KVM_OPEN2 1" >>confdefs.h + +fi + + +# kgdb needs kvm_kerndisp for relocatable kernels +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing kvm_kerndisp" >&5 +$as_echo_n "checking for library containing kvm_kerndisp... " >&6; } +if ${ac_cv_search_kvm_kerndisp+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char kvm_kerndisp (); +int +main () +{ +return kvm_kerndisp (); + ; + return 0; +} +_ACEOF +for ac_lib in '' kvm; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_kvm_kerndisp=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_kvm_kerndisp+:} false; then : + break +fi +done +if ${ac_cv_search_kvm_kerndisp+:} false; then : + +else + ac_cv_search_kvm_kerndisp=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_kvm_kerndisp" >&5 +$as_echo "$ac_cv_search_kvm_kerndisp" >&6; } +ac_res=$ac_cv_search_kvm_kerndisp +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +$as_echo "#define HAVE_KVM_DISP 1" >>confdefs.h + +fi + + # Check whether --with-zstd was given. if test "${with_zstd+set}" = set; then : diff --git gdb/configure.ac gdb/configure.ac -index c81df8c4967..b3e1b3b5283 100644 +index 3912b77b27f..bc960202b22 100644 --- gdb/configure.ac +++ gdb/configure.ac -@@ -472,6 +472,16 @@ AC_SEARCH_LIBS(socketpair, socket) +@@ -516,6 +516,16 @@ AC_SEARCH_LIBS(gethostbyname, nsl) AM_ZLIB AC_ZSTD +# kgdb needs kvm_open2 for cross-debugging +AC_SEARCH_LIBS(kvm_open2, kvm, + [AC_DEFINE(HAVE_KVM_OPEN2, 1, + [Define to 1 if your system has the kvm_open2 function. ])]) + +# kgdb needs kvm_kerndisp for relocatable kernels +AC_SEARCH_LIBS(kvm_kerndisp, kvm, + [AC_DEFINE(HAVE_KVM_DISP, 1, + [Define to 1 if your system has the kvm_kerndisp function. ])]) + AM_ICONV # GDB may fork/exec the iconv program to get the list of supported character diff --git gdb/configure.nat gdb/configure.nat -index aabcdeff989..6aeee4b61fa 100644 +index 1dc4206b69c..cb46e1505c7 100644 --- gdb/configure.nat +++ gdb/configure.nat @@ -63,7 +63,8 @@ case ${gdb_host} in LOADLIBES='-ldl $(RDYNAMIC)' ;; fbsd*) - NATDEPFILES='fork-child.o nat/fork-inferior.o inf-ptrace.o fbsd-nat.o' + NATDEPFILES='fork-child.o nat/fork-inferior.o inf-ptrace.o fbsd-nat.o \ + fbsd-kvm.o' HAVE_NATIVE_GCORE_HOST=1 LOADLIBES='-lkvm' ;; diff --git gdb/configure.tgt gdb/configure.tgt -index e84e222ba0d..cd3ef37fac6 100644 +index 47a674201f9..4b4b6893edf 100644 --- gdb/configure.tgt +++ gdb/configure.tgt -@@ -115,7 +115,7 @@ esac +@@ -122,7 +122,7 @@ esac case "${targ}" in *-*-freebsd* | *-*-kfreebsd*-gnu) - os_obs="fbsd-tdep.o solib-svr4.o";; + os_obs="fbsd-tdep.o solib-svr4.o fbsd-kld.o fbsd-kthr.o";; *-*-netbsd* | *-*-knetbsd*-gnu) os_obs="netbsd-tdep.o solib-svr4.o";; *-*-openbsd*) -@@ -132,7 +132,7 @@ aarch64*-*-elf | aarch64*-*-rtems*) +@@ -139,7 +139,7 @@ aarch64*-*-elf | aarch64*-*-rtems*) aarch64*-*-freebsd*) # Target: FreeBSD/aarch64 - gdb_target_obs="aarch64-fbsd-tdep.o" + gdb_target_obs="aarch64-fbsd-tdep.o aarch64-fbsd-kern.o" ;; aarch64*-*-linux*) -@@ -188,7 +188,7 @@ arm*-*-linux*) +@@ -202,7 +202,7 @@ arm*-*-linux*) ;; arm*-*-freebsd*) # Target: FreeBSD/arm - gdb_target_obs="arm-fbsd-tdep.o" + gdb_target_obs="arm-fbsd-tdep.o arm-fbsd-kern.o" ;; arm*-*-netbsd* | arm*-*-knetbsd*-gnu) # Target: NetBSD/arm -@@ -280,7 +280,11 @@ i[34567]86-*-dicos*) +@@ -294,7 +294,11 @@ i[34567]86-*-dicos*) ;; i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu) # Target: FreeBSD/i386 - gdb_target_obs="i386-bsd-tdep.o i386-fbsd-tdep.o " + gdb_target_obs="i386-bsd-tdep.o i386-fbsd-tdep.o i386fbsd-kern.o" + if test "x$enable_64_bit_bfd" = "xyes"; then + # Target: FreeBSD amd64 + gdb_target_obs="amd64fbsd-tdep.o amd64fbsd-kern.o ${gdb_target_obs}" + fi ;; i[34567]86-*-netbsd* | i[34567]86-*-knetbsd*-gnu) # Target: NetBSD/i386 -@@ -420,7 +424,7 @@ mips*-*-netbsd* | mips*-*-knetbsd*-gnu) +@@ -434,7 +438,7 @@ mips*-*-netbsd* | mips*-*-knetbsd*-gnu) ;; mips*-*-freebsd*) # Target: MIPS running FreeBSD - gdb_target_obs="mips-tdep.o mips-fbsd-tdep.o" + gdb_target_obs="mips-tdep.o mips-fbsd-tdep.o mipsfbsd-kern.o" ;; mips64*-*-openbsd*) # Target: OpenBSD/mips64 -@@ -478,7 +482,7 @@ or1k-*-* | or1knd-*-*) +@@ -492,7 +496,7 @@ or1k-*-* | or1knd-*-*) powerpc*-*-freebsd*) # Target: FreeBSD/powerpc gdb_target_obs="rs6000-tdep.o ppc-sysv-tdep.o ppc64-tdep.o \ - ppc-fbsd-tdep.o \ + ppc-fbsd-tdep.o ppcfbsd-kern.o \ ravenscar-thread.o ppc-ravenscar-thread.o" ;; -@@ -527,7 +531,7 @@ s390*-*-linux*) +@@ -541,7 +545,7 @@ s390*-*-linux*) riscv*-*-freebsd*) # Target: FreeBSD/riscv - gdb_target_obs="riscv-fbsd-tdep.o" + gdb_target_obs="riscv-fbsd-tdep.o riscv-fbsd-kern.o" ;; riscv*-*-linux*) -@@ -592,6 +596,7 @@ sparc64-*-linux*) +@@ -606,6 +610,7 @@ sparc64-*-linux*) sparc*-*-freebsd* | sparc*-*-kfreebsd*-gnu) # Target: FreeBSD/sparc64 gdb_target_obs="sparc-tdep.o sparc64-tdep.o sparc64-fbsd-tdep.o \ + sparc64fbsd-kern.o \ ravenscar-thread.o sparc-ravenscar-thread.o" ;; sparc-*-netbsd* | sparc-*-knetbsd*-gnu) -@@ -708,8 +713,8 @@ x86_64-*-linux*) +@@ -722,8 +727,8 @@ x86_64-*-linux*) ;; x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) # Target: FreeBSD/amd64 - gdb_target_obs="amd64-fbsd-tdep.o ${i386_tobjs} \ - i386-bsd-tdep.o i386-fbsd-tdep.o" + gdb_target_obs="amd64-fbsd-tdep.o amd64fbsd-kern.o ${i386_tobjs} \ + i386-bsd-tdep.o i386-fbsd-tdep.o i386fbsd-kern.o" ;; x86_64-*-mingw* | x86_64-*-cygwin*) # Target: MingW/amd64 diff --git gdb/osabi.c gdb/osabi.c -index d18802ac3a4..4f3aa6a52da 100644 +index ad3dad5b849..29e8578d031 100644 --- gdb/osabi.c +++ gdb/osabi.c @@ -67,6 +67,7 @@ static const struct osabi_names gdb_osabi_names[] = { "Solaris", NULL }, { "GNU/Linux", "linux(-gnu[^-]*)?" }, { "FreeBSD", NULL }, + { "FreeBSD/kernel", NULL }, { "NetBSD", NULL }, { "OpenBSD", NULL }, { "WindowsCE", NULL }, diff --git gdb/osabi.h gdb/osabi.h index 35f14ec433c..1276d34d5f7 100644 --- gdb/osabi.h +++ gdb/osabi.h @@ -31,6 +31,7 @@ enum gdb_osabi GDB_OSABI_SOLARIS, GDB_OSABI_LINUX, GDB_OSABI_FREEBSD, + GDB_OSABI_FREEBSD_KERNEL, GDB_OSABI_NETBSD, GDB_OSABI_OPENBSD, GDB_OSABI_WINCE, diff --git gdb/regcache.c gdb/regcache.c -index 56b6d047874..47637c628a7 100644 +index 91b20b7a2a2..0cfa1bae3d9 100644 --- gdb/regcache.c +++ gdb/regcache.c -@@ -1112,6 +1112,22 @@ reg_buffer::raw_supply_zeroed (int regnum) +@@ -1123,6 +1123,22 @@ reg_buffer::raw_supply_zeroed (int regnum) m_register_status[regnum] = REG_VALID; } +void +reg_buffer::raw_supply_unsigned (int regnum, ULONGEST val) +{ + enum bfd_endian byte_order = gdbarch_byte_order (m_descr->gdbarch); + gdb_byte *regbuf; + size_t regsize; + + assert_regnum (regnum); + + regbuf = register_buffer (regnum); + regsize = m_descr->sizeof_register[regnum]; + + store_unsigned_integer (regbuf, regsize, byte_order, val); + m_register_status[regnum] = REG_VALID; +} + /* See gdbsupport/common-regcache.h. */ void +@@ -1289,6 +1305,53 @@ regcache::collect_regset (const struct regset *regset, int regbase, + size); + } + ++/* See regcache.h */ ++ ++int ++regcache_map_entry_size (const struct regcache_map_entry *map, gdbarch *gdbarch) ++{ ++ int size = 0, count; ++ ++ for (; (count = map->count) != 0; map++) ++ { ++ int regno = map->regno; ++ int slot_size = map->size; ++ ++ if (slot_size == 0 && regno != REGCACHE_MAP_SKIP) ++ slot_size = register_size (gdbarch, regno); ++ ++ size += count * slot_size; ++ } ++ return size; ++} ++ ++/* See regcache.h */ ++ ++int ++regcache_map_offset (const struct regcache_map_entry *map, int regnum, ++ gdbarch *gdbarch) ++{ ++ int offs = 0, count; ++ ++ for (; (count = map->count) != 0; map++) ++ { ++ int regno = map->regno; ++ int slot_size = map->size; ++ ++ if (slot_size == 0 && regno != REGCACHE_MAP_SKIP) ++ slot_size = register_size (gdbarch, regno); ++ ++ if (regno != REGCACHE_MAP_SKIP && regnum >= regno ++ && regnum < regno + count) ++ return offs + (regno - regnum) * slot_size; ++ ++ offs += count * slot_size; ++ } ++ return -1; ++} ++ ++/* See regcache.h */ ++ + bool + regcache_map_supplies (const struct regcache_map_entry *map, int regnum, + struct gdbarch *gdbarch, size_t size) diff --git gdb/regcache.h gdb/regcache.h -index b9ffab9950d..f32d7a3bd00 100644 +index 57ddac465f0..b9f62994901 100644 --- gdb/regcache.h +++ gdb/regcache.h -@@ -237,6 +237,8 @@ class reg_buffer : public reg_buffer_common +@@ -133,6 +133,11 @@ regcache_map_entry_size (const struct regcache_map_entry *map) + return size; + } + ++/* Same as above, but accepts a gdbarch to handle entries with a ++ variable register size. */ ++extern int regcache_map_entry_size (const struct regcache_map_entry *map, ++ gdbarch *gdbarch); ++ + /* Transfer a set of registers (as described by REGSET) between + REGCACHE and BUF. If REGNUM == -1, transfer all registers + belonging to the regset, otherwise just the register numbered +@@ -151,6 +156,13 @@ extern void regcache_collect_regset (const struct regset *regset, + int regnum, void *buf, size_t size); + + ++/* Return the offset of REGNUM in a block of registers described by an ++ array of regcache_map_entries. If the register is not found, ++ returns -1. */ ++ ++extern int regcache_map_offset (const struct regcache_map_entry *map, ++ int regnum, gdbarch *gdbarch); ++ + /* Return true if a set of registers contains the value of the + register numbered REGNUM. The size of the set of registers is + given in SIZE, and the layout of the set of registers is described +@@ -238,6 +250,8 @@ class reg_buffer : public reg_buffer_common only LEN, without editing the rest of the register. */ void raw_supply_part (int regnum, int offset, int len, const gdb_byte *in); + void raw_supply_unsigned (int regnum, ULONGEST val); + void invalidate (int regnum); virtual ~reg_buffer () = default; diff --git a/devel/gdb/files/kgdb/aarch64-fbsd-kern.c b/devel/gdb/files/kgdb/aarch64-fbsd-kern.c index 68b12130fa83..2eb89a7da5e1 100644 --- a/devel/gdb/files/kgdb/aarch64-fbsd-kern.c +++ b/devel/gdb/files/kgdb/aarch64-fbsd-kern.c @@ -1,279 +1,265 @@ /*- * Copyright (c) 2017 John Baldwin * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* Target-dependent code for FreeBSD/aarch64 kernels. */ #include "defs.h" #include "aarch64-tdep.h" #include "frame-unwind.h" #include "gdbarch.h" #include "gdbcore.h" #include "osabi.h" #include "regcache.h" #include "regset.h" #include "solib.h" #include "target.h" #include "trad-frame.h" #include "kgdb.h" -struct aarch64fbsd_info +struct aarch64_fbsd_kern_info { - int osreldate; + LONGEST osreldate = 0; }; /* Per-program-space data key. */ -static const registry::key aarch64fbsd_pspace_data; +static const registry::key +aarch64_fbsd_kern_pspace_data; -static void -aarch64fbsd_pspace_data_cleanup (struct program_space *pspace, void *arg) -{ - struct aarch64fbsd_info *info = (struct aarch64fbsd_info *)arg; - - xfree (info); -} - -/* Get the current aarch64_fbsd data. If none is found yet, add it +/* Get the current aarch64_fbsd_kern data. If none is found yet, add it now. This function always returns a valid object. */ -static struct aarch64fbsd_info * -get_aarch64fbsd_info (void) +static struct aarch64_fbsd_kern_info * +get_aarch64_fbsd_kern_info (void) { - struct aarch64fbsd_info *info; + struct aarch64_fbsd_kern_info *info; - info = aarch64fbsd_pspace_data.get (current_program_space); + info = aarch64_fbsd_kern_pspace_data.get (current_program_space); if (info != nullptr) return info; - info = aarch64fbsd_pspace_data.emplace (current_program_space); - + info = aarch64_fbsd_kern_pspace_data.emplace (current_program_space); info->osreldate = parse_and_eval_long ("osreldate"); return info; } static const struct regcache_map_entry aarch64_fbsd_pcbmap[] = { { 11, AARCH64_X0_REGNUM + 19, 8 }, /* x19 ... x29 */ { 1, AARCH64_PC_REGNUM, 8 }, { 1, AARCH64_SP_REGNUM, 8 }, { 0 } }; static const struct regset aarch64_fbsd_pcbregset = { aarch64_fbsd_pcbmap, regcache_supply_regset, regcache_collect_regset }; /* In kernels prior to __FreeBSD_version 1400084, struct pcb used an alternate layout. */ static const struct regcache_map_entry aarch64_fbsd13_pcbmap[] = { { 30, AARCH64_X0_REGNUM, 8 }, /* x0 ... x29 */ { 1, AARCH64_PC_REGNUM, 8 }, { 1, REGCACHE_MAP_SKIP, 8 }, { 1, AARCH64_SP_REGNUM, 8 }, { 0 } }; static const struct regset aarch64_fbsd13_pcbregset = { aarch64_fbsd13_pcbmap, regcache_supply_regset, regcache_collect_regset }; static void aarch64_fbsd_supply_pcb(struct regcache *regcache, CORE_ADDR pcb_addr) { const struct regset *pcbregset; - struct aarch64fbsd_info *info = get_aarch64fbsd_info(); + struct aarch64_fbsd_kern_info *info = get_aarch64_fbsd_kern_info(); gdb_byte buf[8 * 33]; if (info->osreldate >= 1400084) pcbregset = &aarch64_fbsd_pcbregset; else pcbregset = &aarch64_fbsd13_pcbregset; - if (target_read_memory (pcb_addr, buf, sizeof buf) == 0) regcache_supply_regset (pcbregset, regcache, -1, buf, sizeof (buf)); } static const struct regcache_map_entry aarch64_fbsd_trapframe_map[] = { { 1, AARCH64_SP_REGNUM, 8 }, { 1, AARCH64_LR_REGNUM, 8 }, { 1, AARCH64_PC_REGNUM, 8 }, { 1, AARCH64_CPSR_REGNUM, 8 }, { 1, REGCACHE_MAP_SKIP, 8 }, /* esr */ { 1, REGCACHE_MAP_SKIP, 8 }, /* far */ - { 30, AARCH64_X0_REGNUM, 8 }, /* x0 ... x29 */ - { 0 }, + { 30, AARCH64_X0_REGNUM, 8 }, /* x0 ... x29 */ + { 0 } }; /* In kernels prior to __FreeBSD_version 1400084, struct trapframe used an alternate layout. */ static const struct regcache_map_entry aarch64_fbsd13_trapframe_map[] = { { 1, AARCH64_SP_REGNUM, 8 }, { 1, AARCH64_LR_REGNUM, 8 }, { 1, AARCH64_PC_REGNUM, 8 }, { 1, AARCH64_CPSR_REGNUM, 4 }, { 1, REGCACHE_MAP_SKIP, 4 }, /* esr */ - { 30, AARCH64_X0_REGNUM, 8 }, /* x0 ... x29 */ - { 0 }, + { 30, AARCH64_X0_REGNUM, 8 }, /* x0 ... x29 */ + { 0 } }; static struct trad_frame_cache * aarch64_fbsd_trapframe_cache (frame_info_ptr this_frame, void **this_cache) { struct gdbarch *gdbarch = get_frame_arch (this_frame); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); - struct aarch64fbsd_info *info = get_aarch64fbsd_info(); + struct aarch64_fbsd_kern_info *info = get_aarch64_fbsd_kern_info(); struct trad_frame_cache *cache; - CORE_ADDR func, pc, sp; + CORE_ADDR func, offset, pc, sp; const char *name; int i, tf_size; if (*this_cache != NULL) return ((struct trad_frame_cache *)*this_cache); const struct regcache_map_entry *trapframe_map; - if (info->osreldate >= 1400084) - { - trapframe_map = aarch64_fbsd_trapframe_map; - } + trapframe_map = aarch64_fbsd_trapframe_map; else - { - trapframe_map = aarch64_fbsd13_trapframe_map; - } + trapframe_map = aarch64_fbsd13_trapframe_map; cache = trad_frame_cache_zalloc (this_frame); *this_cache = cache; - func = get_frame_func (this_frame); sp = get_frame_register_unsigned (this_frame, AARCH64_SP_REGNUM); - find_pc_partial_function (func, &name, NULL, NULL); - tf_size = regcache_map_entry_size (trapframe_map); trad_frame_set_reg_regmap (cache, trapframe_map, sp, tf_size); /* Read $PC from trap frame. */ - pc = read_memory_unsigned_integer (sp + 2 * 8, 8, byte_order); + func = get_frame_func (this_frame); + find_pc_partial_function (func, &name, NULL, NULL); + offset = regcache_map_offset (trapframe_map, AARCH64_PC_REGNUM, gdbarch); + pc = read_memory_unsigned_integer (sp + offset, 8, byte_order); if (pc == 0 && strcmp(name, "fork_trampoline") == 0) { /* Initial frame of a kthread; terminate backtrace. */ trad_frame_set_id (cache, outer_frame_id); } else { /* Construct the frame ID using the function start. */ - trad_frame_set_id (cache, frame_id_build (sp + tf_size, func)); + trad_frame_set_id (cache, frame_id_build (sp, func)); } return cache; } static void aarch64_fbsd_trapframe_this_id (frame_info_ptr this_frame, void **this_cache, struct frame_id *this_id) { struct trad_frame_cache *cache = aarch64_fbsd_trapframe_cache (this_frame, this_cache); trad_frame_get_id (cache, this_id); } static struct value * aarch64_fbsd_trapframe_prev_register (frame_info_ptr this_frame, void **this_cache, int regnum) { struct trad_frame_cache *cache = aarch64_fbsd_trapframe_cache (this_frame, this_cache); return trad_frame_get_register (cache, this_frame, regnum); } static int aarch64_fbsd_trapframe_sniffer (const struct frame_unwind *self, frame_info_ptr this_frame, void **this_prologue_cache) { const char *name; find_pc_partial_function (get_frame_func (this_frame), &name, NULL, NULL); return (name && ((strcmp (name, "handle_el1h_sync") == 0) || (strcmp (name, "handle_el1h_irq") == 0) || (strcmp (name, "handle_el0_sync") == 0) || (strcmp (name, "handle_el0_irq") == 0) || (strcmp (name, "handle_el0_error") == 0) || (strcmp (name, "fork_trampoline") == 0))); } static const struct frame_unwind aarch64_fbsd_trapframe_unwind = { "aarch64 FreeBSD kernel trap", SIGTRAMP_FRAME, default_frame_unwind_stop_reason, aarch64_fbsd_trapframe_this_id, aarch64_fbsd_trapframe_prev_register, NULL, aarch64_fbsd_trapframe_sniffer }; /* Implement the 'init_osabi' method of struct gdb_osabi_handler. */ static void aarch64_fbsd_kernel_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { aarch64_gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); frame_unwind_prepend_unwinder (gdbarch, &aarch64_fbsd_trapframe_unwind); set_gdbarch_so_ops (gdbarch, &kld_so_ops); /* Enable longjmp. */ tdep->jb_pc = 13; fbsd_vmcore_set_supply_pcb (gdbarch, aarch64_fbsd_supply_pcb); fbsd_vmcore_set_cpu_pcb_addr (gdbarch, kgdb_trgt_stop_pcb); } void _initialize_aarch64_kgdb_tdep (); void _initialize_aarch64_kgdb_tdep () { gdbarch_register_osabi_sniffer(bfd_arch_aarch64, bfd_target_elf_flavour, fbsd_kernel_osabi_sniffer); gdbarch_register_osabi (bfd_arch_aarch64, 0, GDB_OSABI_FREEBSD_KERNEL, aarch64_fbsd_kernel_init_abi); } diff --git a/devel/gdb/files/kgdb/fbsd-kthr.c b/devel/gdb/files/kgdb/fbsd-kthr.c index 4bfadac8db9b..603e9bd4178f 100644 --- a/devel/gdb/files/kgdb/fbsd-kthr.c +++ b/devel/gdb/files/kgdb/fbsd-kthr.c @@ -1,435 +1,435 @@ /* * Copyright (c) 2004 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include #include #include #include "defs.h" #include "gdbcore.h" #include "objfiles.h" #include "value.h" #include "kgdb.h" static CORE_ADDR dumppcb; static LONGEST dumptid; static CORE_ADDR stopped_cpus; static LONGEST mp_maxid; static struct kthr *first, *last; struct kthr *curkthr; static int proc_off_p_pid, proc_off_p_comm, proc_off_p_hash, proc_off_p_list; static int proc_off_p_threads; static int thread_off_td_tid, thread_off_td_oncpu, thread_off_td_pcb; static int thread_off_td_name, thread_off_td_plist; static int thread_oncpu_size; CORE_ADDR kgdb_lookup(const char *sym) { struct bound_minimal_symbol msym; msym = lookup_minimal_symbol(sym, NULL, NULL); if (msym.minsym == NULL) return (0); return (msym.value_address ()); } /* * Perform the equivalent of CPU_ISSET() to see if 'cpu' is set in the * kernel's stopped_cpus set. The set contains an array of longs. * This function determines the specific long to read and tests the * necessary bit in the long. */ static bool cpu_stopped(int cpu) { struct gdbarch *gdbarch = target_gdbarch (); CORE_ADDR addr; ULONGEST mask; int bit, long_bytes, word; if (cpu < 0 || cpu > mp_maxid || stopped_cpus == 0) return (false); bit = cpu % gdbarch_long_bit (gdbarch); word = cpu / gdbarch_long_bit (gdbarch); long_bytes = gdbarch_long_bit (gdbarch) / 8; addr = stopped_cpus + word * long_bytes; mask = read_memory_unsigned_integer (addr, long_bytes, gdbarch_byte_order (gdbarch)); return (mask & ((ULONGEST)1 << bit)) != 0; } struct kthr * kgdb_thr_first(void) { return (first); } static void kgdb_thr_add_proc(CORE_ADDR paddr, CORE_ADDR (*cpu_pcb_addr) (u_int)) { struct gdbarch *gdbarch = target_gdbarch (); struct type *ptr_type = builtin_type (gdbarch)->builtin_data_ptr; enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); struct kthr *kt; CORE_ADDR pcb, tdaddr, tdnext; ULONGEST oncpu; LONGEST pid, tid; try { tdaddr = read_memory_typed_address (paddr + proc_off_p_threads, ptr_type); pid = read_memory_integer (paddr + proc_off_p_pid, 4, byte_order); } catch (const gdb_exception_error &e) { return; } while (tdaddr != 0) { try { tid = read_memory_integer (tdaddr + thread_off_td_tid, 4, byte_order); oncpu = read_memory_unsigned_integer (tdaddr + thread_off_td_oncpu, thread_oncpu_size, byte_order); pcb = read_memory_typed_address (tdaddr + thread_off_td_pcb, ptr_type); tdnext = read_memory_typed_address (tdaddr + thread_off_td_plist, ptr_type); } catch (const gdb_exception_error &e) { return; } kt = XNEW (struct kthr); if (last == NULL) first = last = kt; else last->next = kt; kt->next = NULL; kt->kaddr = tdaddr; if (tid == dumptid) kt->pcb = dumppcb; else if (cpu_stopped(oncpu)) kt->pcb = cpu_pcb_addr(oncpu); else kt->pcb = pcb; kt->tid = tid; kt->pid = pid; kt->paddr = paddr; kt->cpu = oncpu; last = kt; tdaddr = tdnext; } } static void kgdb_thr_add_procs_hash(CORE_ADDR pidhashtbl, CORE_ADDR (*cpu_pcb_addr) (u_int)) { struct gdbarch *gdbarch = target_gdbarch (); struct type *ptr_type = builtin_type (gdbarch)->builtin_data_ptr; enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); CORE_ADDR paddr, pnext; ULONGEST i, pidhash; pidhash = parse_and_eval_long("pidhash"); for (i = 0; i < pidhash; i++) { try { paddr = read_memory_typed_address (pidhashtbl + i * ptr_type->length (), ptr_type); } catch (const gdb_exception_error &e) { continue; } while (paddr != 0) { try { pnext = read_memory_typed_address (paddr + proc_off_p_hash, ptr_type); } catch (const gdb_exception_error &e) { break; } kgdb_thr_add_proc(paddr, cpu_pcb_addr); paddr = pnext; } } } static void kgdb_thr_add_procs_list(CORE_ADDR paddr, CORE_ADDR (*cpu_pcb_addr) (u_int)) { struct gdbarch *gdbarch = target_gdbarch (); struct type *ptr_type = builtin_type (gdbarch)->builtin_data_ptr; enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); CORE_ADDR pnext; while (paddr != 0) { try { pnext = read_memory_typed_address (paddr + proc_off_p_list, ptr_type); } catch (const gdb_exception_error &e) { break; } kgdb_thr_add_proc(paddr, cpu_pcb_addr); paddr = pnext; } } struct kthr * kgdb_thr_init(CORE_ADDR (*cpu_pcb_addr) (u_int)) { struct gdbarch *gdbarch = target_gdbarch (); struct type *ptr_type = builtin_type (gdbarch)->builtin_data_ptr; struct kthr *kt; CORE_ADDR addr, paddr; while (first != NULL) { kt = first; first = kt->next; free(kt); } last = NULL; dumppcb = kgdb_lookup("dumppcb"); if (dumppcb == 0) return (NULL); try { dumptid = parse_and_eval_long("dumptid"); } catch (const gdb_exception_error &e) { dumptid = -1; } try { mp_maxid = parse_and_eval_long("mp_maxid"); } catch (const gdb_exception_error &e) { mp_maxid = 0; } stopped_cpus = kgdb_lookup("stopped_cpus"); /* * Newer kernels export a set of global variables with the offsets * of certain members in struct proc and struct thread. For older * kernels, try to extract these offsets using debug symbols. If * that fails, use native values. */ try { proc_off_p_pid = parse_and_eval_long("proc_off_p_pid"); proc_off_p_comm = parse_and_eval_long("proc_off_p_comm"); proc_off_p_list = parse_and_eval_long("proc_off_p_list"); proc_off_p_threads = parse_and_eval_long("proc_off_p_threads"); thread_off_td_tid = parse_and_eval_long("thread_off_td_tid"); thread_off_td_name = parse_and_eval_long("thread_off_td_name"); thread_off_td_oncpu = parse_and_eval_long("thread_off_td_oncpu"); thread_off_td_pcb = parse_and_eval_long("thread_off_td_pcb"); thread_off_td_plist = parse_and_eval_long("thread_off_td_plist"); thread_oncpu_size = 4; } catch (const gdb_exception_error &e) { try { struct symbol *proc_sym = lookup_symbol_in_language ("struct proc", NULL, STRUCT_DOMAIN, language_c, NULL).symbol; if (proc_sym == NULL) error (_("Unable to find struct proc symbol")); proc_off_p_pid = lookup_struct_elt (proc_sym->type (), "p_pid", 0).offset / 8; proc_off_p_comm = lookup_struct_elt (proc_sym->type (), "p_comm", 0).offset / 8; proc_off_p_list = lookup_struct_elt (proc_sym->type (), "p_list", 0).offset / 8; proc_off_p_threads = lookup_struct_elt (proc_sym->type (), "p_threads", 0).offset / 8; struct symbol *thread_sym = lookup_symbol_in_language ("struct thread", NULL, STRUCT_DOMAIN, language_c, NULL).symbol; if (thread_sym == NULL) error (_("Unable to find struct thread symbol")); thread_off_td_tid = lookup_struct_elt (proc_sym->type (), "td_tid", 0).offset / 8; thread_off_td_name = lookup_struct_elt (proc_sym->type (), "td_name", 0).offset / 8; thread_off_td_pcb = lookup_struct_elt (proc_sym->type (), "td_pcb", 0).offset / 8; thread_off_td_plist = lookup_struct_elt (proc_sym->type (), "td_plist", 0).offset / 8; struct_elt td_oncpu = lookup_struct_elt (proc_sym->type (), "td_oncpu", 0); thread_off_td_oncpu = td_oncpu.offset / 8; - thread_oncpu_size = FIELD_BITSIZE(*td_oncpu.field) / 8; + thread_oncpu_size = td_oncpu.field->bitsize () / 8; } catch (const gdb_exception_error &e2) { proc_off_p_pid = offsetof(struct proc, p_pid); proc_off_p_comm = offsetof(struct proc, p_comm); proc_off_p_list = offsetof(struct proc, p_list); proc_off_p_threads = offsetof(struct proc, p_threads); thread_off_td_tid = offsetof(struct thread, td_tid); thread_off_td_name = offsetof(struct thread, td_name); thread_off_td_oncpu = offsetof(struct thread, td_oncpu); thread_off_td_pcb = offsetof(struct thread, td_pcb); thread_off_td_plist = offsetof(struct thread, td_plist); thread_oncpu_size = sizeof(((struct thread *)0)->td_oncpu); } } /* * Handle p_hash separately. */ try { proc_off_p_hash = parse_and_eval_long("proc_off_p_hash"); } catch (const gdb_exception_error &e) { try { struct symbol *proc_sym = lookup_symbol_in_language ("struct proc", NULL, STRUCT_DOMAIN, language_c, NULL).symbol; if (proc_sym == NULL) error (_("Unable to find struct proc symbol")); proc_off_p_hash = lookup_struct_elt (proc_sym->type (), "p_hash", 0).offset / 8; } catch (const gdb_exception_error &e2) { proc_off_p_hash = offsetof(struct proc, p_hash); } } addr = kgdb_lookup("zombproc"); if (addr != 0) { addr = kgdb_lookup("allproc"); try { paddr = read_memory_typed_address (addr, ptr_type); kgdb_thr_add_procs_list(paddr, cpu_pcb_addr); } catch (const gdb_exception_error &e) { return (NULL); } try { paddr = read_memory_typed_address (addr, ptr_type); kgdb_thr_add_procs_list(paddr, cpu_pcb_addr); } catch (const gdb_exception_error &e) { } } else { addr = kgdb_lookup("pidhashtbl"); try { addr = read_memory_typed_address (addr, ptr_type); kgdb_thr_add_procs_hash(addr, cpu_pcb_addr); } catch (const gdb_exception_error &e) { return (NULL); } } curkthr = kgdb_thr_lookup_tid(dumptid); if (curkthr == NULL) curkthr = first; return (first); } struct kthr * kgdb_thr_lookup_tid(int tid) { struct kthr *kt; kt = first; while (kt != NULL && kt->tid != tid) kt = kt->next; return (kt); } struct kthr * kgdb_thr_lookup_taddr(uintptr_t taddr) { struct kthr *kt; kt = first; while (kt != NULL && kt->kaddr != taddr) kt = kt->next; return (kt); } struct kthr * kgdb_thr_lookup_pid(int pid) { struct kthr *kt; kt = first; while (kt != NULL && kt->pid != pid) kt = kt->next; return (kt); } struct kthr * kgdb_thr_lookup_paddr(uintptr_t paddr) { struct kthr *kt; kt = first; while (kt != NULL && kt->paddr != paddr) kt = kt->next; return (kt); } struct kthr * kgdb_thr_next(struct kthr *kt) { return (kt->next); } const char * kgdb_thr_extra_thread_info(int tid) { static char buf[64]; struct kthr *kt = kgdb_thr_lookup_tid(tid); if (kt == nullptr) return (nullptr); snprintf(buf, sizeof (buf), "PID=%d", kt->pid); gdb::unique_xmalloc_ptr comm = target_read_string (kt->paddr + proc_off_p_comm, MAXCOMLEN + 1); if (comm != nullptr) { strlcat(buf, ": ", sizeof (buf)); strlcat(buf, comm.get (), sizeof (buf)); gdb::unique_xmalloc_ptr td_name = target_read_string (kt->kaddr + thread_off_td_name, MAXCOMLEN + 1); if (td_name != nullptr && strcmp (comm.get (), td_name.get ()) != 0) { strlcat(buf, "/", sizeof (buf)); strlcat(buf, td_name.get (), sizeof (buf)); } } return (buf); } diff --git a/devel/gdb/files/kgdb/fbsd-kvm.c b/devel/gdb/files/kgdb/fbsd-kvm.c index bd4f71fecddd..8c7406c0b177 100644 --- a/devel/gdb/files/kgdb/fbsd-kvm.c +++ b/devel/gdb/files/kgdb/fbsd-kvm.c @@ -1,639 +1,629 @@ /* * Copyright (c) 2004 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "defs.h" #include "command.h" #include "elf-bfd.h" #include "filenames.h" #include "gdbcore.h" #include "gdbthread.h" #include "gdbsupport/gdb_obstack.h" #include "inferior.h" #include "objfiles.h" #include "osabi.h" #include "process-stratum-target.h" #include "solib.h" #include "target.h" #include "value.h" #include "readline/tilde.h" #include "gdbsupport/buildargv.h" #include "gdbsupport/pathstuff.h" #include "gdbsupport/gdb_tilde_expand.h" #include #include #include #include "kgdb.h" static CORE_ADDR stoppcbs; static LONGEST pcb_size; static std::string vmcore; struct fbsd_vmcore_ops { /* Supply registers for a pcb to a register cache. */ void (*supply_pcb)(struct regcache *, CORE_ADDR) = nullptr; /* Return address of pcb for thread running on a CPU. */ CORE_ADDR (*cpu_pcb_addr)(u_int) = nullptr; }; /* Per-architecture data key. */ static const registry::key fbsd_vmcore_data; static struct fbsd_vmcore_ops * get_fbsd_vmcore_ops (struct gdbarch *gdbarch) { struct fbsd_vmcore_ops *ops = fbsd_vmcore_data.get (gdbarch); if (ops == nullptr) ops = fbsd_vmcore_data.emplace (gdbarch); return ops; } /* Set the function that supplies registers from a pcb for architecture GDBARCH to SUPPLY_PCB. */ void fbsd_vmcore_set_supply_pcb (struct gdbarch *gdbarch, void (*supply_pcb) (struct regcache *, CORE_ADDR)) { struct fbsd_vmcore_ops *ops = get_fbsd_vmcore_ops (gdbarch); ops->supply_pcb = supply_pcb; } /* Set the function that returns the address of the pcb for a thread running on a CPU for architecture GDBARCH to CPU_PCB_ADDR. */ void fbsd_vmcore_set_cpu_pcb_addr (struct gdbarch *gdbarch, CORE_ADDR (*cpu_pcb_addr) (u_int)) { struct fbsd_vmcore_ops *ops = get_fbsd_vmcore_ops (gdbarch); ops->cpu_pcb_addr = cpu_pcb_addr; } static CORE_ADDR kernstart; static kvm_t *kvm; int kgdb_quiet; static ptid_t fbsd_vmcore_ptid(int tid) { if (kvm == NULL) /* * The remote target stores the 'tid' in the lwp * field. */ return ptid_t(inferior_ptid.pid(), tid, 0); /* * This follows the model described in bsd-kvm.c except that * in kernel tids are used as the tid of the ptid instead of a * process ID. */ return ptid_t(1, 1, tid); } #define MSGBUF_SEQ_TO_POS(size, seq) ((seq) % (size)) static void kgdb_dmesg(void) { CORE_ADDR bufp; int size, rseq, wseq; gdb_byte c; /* * Display the unread portion of the message buffer. This gives the * user a some initial data to work from. */ if (kgdb_quiet) return; try { bufp = parse_and_eval_address("msgbufp->msg_ptr"); size = parse_and_eval_long("msgbufp->msg_size"); rseq = parse_and_eval_long("msgbufp->msg_rseq"); wseq = parse_and_eval_long("msgbufp->msg_wseq"); } catch (const gdb_exception_error &e) { return; } if (size == 0) return; rseq = MSGBUF_SEQ_TO_POS(size, rseq); wseq = MSGBUF_SEQ_TO_POS(size, wseq); if (rseq == wseq) return; printf("\nUnread portion of the kernel message buffer:\n"); while (rseq < wseq) { read_memory(bufp + rseq, &c, 1); putchar(c); rseq++; if (rseq == size) rseq = 0; } if (c != '\n') putchar('\n'); putchar('\n'); } #define KERNEL_INTERP "/red/herring" enum gdb_osabi fbsd_kernel_osabi_sniffer(bfd *abfd) { asection *s; bfd_byte buf[sizeof(KERNEL_INTERP)]; bfd_byte *bufp; /* First, determine if this is a FreeBSD/ELF binary. */ switch (elf_elfheader(abfd)->e_ident[EI_OSABI]) { case ELFOSABI_FREEBSD: break; case ELFOSABI_NONE: { enum gdb_osabi osabi = GDB_OSABI_UNKNOWN; for (asection *sect : gdb_bfd_sections (abfd)) generic_elf_osabi_sniff_abi_tag_sections (abfd, sect, &osabi); /* * aarch64 and RISC-V kernels don't have the right * note tag for kernels so just look for /red/herring * anyway. */ if (osabi == GDB_OSABI_UNKNOWN && ((elf_elfheader(abfd)->e_machine == EM_AARCH64) || (elf_elfheader(abfd)->e_machine == EM_RISCV))) break; if (osabi != GDB_OSABI_FREEBSD) return (GDB_OSABI_UNKNOWN); break; } default: return (GDB_OSABI_UNKNOWN); } /* FreeBSD ELF kernels have an interpreter path of "/red/herring". */ bufp = buf; s = bfd_get_section_by_name(abfd, ".interp"); if (s != NULL && bfd_section_size(s) == sizeof(buf) && bfd_get_full_section_contents(abfd, s, &bufp) && memcmp(buf, KERNEL_INTERP, sizeof(buf)) == 0) return (GDB_OSABI_FREEBSD_KERNEL); return (GDB_OSABI_UNKNOWN); } /* The FreeBSD libkvm target. */ static const target_info fbsd_kvm_target_info = { "vmcore", N_("Kernel core dump file"), N_("Use a vmcore file as a target.\n\ If no filename is specified, /dev/mem is used to examine the running kernel.\n\ target vmcore [-w] [filename]") }; class fbsd_kvm_target final : public process_stratum_target { public: fbsd_kvm_target () = default; const target_info &info () const override { return fbsd_kvm_target_info; } void close () override; void fetch_registers (struct regcache *, int) override; enum target_xfer_status xfer_partial (enum target_object object, const char *annex, gdb_byte *readbuf, const gdb_byte *writebuf, ULONGEST offset, ULONGEST len, ULONGEST *xfered_len) override; void files_info () override; bool thread_alive (ptid_t ptid) override; std::string pid_to_str (ptid_t) override; const char *extra_thread_info (thread_info *) override; bool has_all_memory () override { return false; } bool has_memory () override; bool has_stack () override; bool has_registers () override; bool has_execution (inferior *inf) override { return false; } }; /* Target ops for libkvm interface. */ static fbsd_kvm_target fbsd_kvm_ops; #ifdef HAVE_KVM_OPEN2 static int kgdb_resolve_symbol(const char *name, kvaddr_t *kva) { struct bound_minimal_symbol ms; ms = lookup_minimal_symbol (name, NULL, NULL); if (ms.minsym == NULL) return (1); *kva = ms.value_address (); return (0); } #endif static void fbsd_kvm_target_open (const char *args, int from_tty) { struct fbsd_vmcore_ops *ops = get_fbsd_vmcore_ops (target_gdbarch ()); char kvm_err[_POSIX2_LINE_MAX]; struct inferior *inf; struct cleanup *old_chain; struct kthr *kt; kvm_t *nkvm; const char *kernel; std::string filename; - int osreldate; + LONGEST osreldate; bool writeable; if (ops == NULL || ops->supply_pcb == NULL || ops->cpu_pcb_addr == NULL) error ("ABI doesn't support a vmcore target"); target_preopen (from_tty); kernel = get_exec_file (0); if (kernel == NULL) error ("Can't open a vmcore without a kernel"); writeable = false; if (args != NULL) { gdb_argv built_argv (args); for (char **argv = built_argv.get (); *argv != NULL; argv++) { if (**argv == '-') { if (strcmp (*argv, "-w") == 0) writeable = true; else error (_("Invalid argument")); } else { if (!filename.empty ()) error (_("Invalid argument")); filename = gdb_tilde_expand (*argv); if (!IS_ABSOLUTE_PATH (filename)) filename = gdb_abspath (filename.c_str ()); } } } #ifdef HAVE_KVM_OPEN2 nkvm = kvm_open2(kernel, filename.c_str (), writeable ? O_RDWR : O_RDONLY, kvm_err, kgdb_resolve_symbol); #else nkvm = kvm_openfiles(kernel, filename.c_str (), NULL, writeable ? O_RDWR : O_RDONLY, kvm_err); #endif if (nkvm == NULL) { error ("Failed to open vmcore: %s", kvm_err); } /* Don't free the filename now and close any previous vmcore. */ current_inferior ()->unpush_target (&fbsd_kvm_ops); #ifdef HAVE_KVM_DISP /* Relocate kernel objfile if needed. */ struct objfile *symfile_objfile = current_program_space->symfile_object_file; if (symfile_objfile != nullptr && (bfd_get_file_flags(symfile_objfile->obfd.get ()) & (EXEC_P | DYNAMIC)) != 0) { CORE_ADDR displacement = kvm_kerndisp(nkvm); if (displacement != 0) { section_offsets new_offsets (symfile_objfile->section_offsets.size (), displacement); objfile_relocate(symfile_objfile, new_offsets); } } #endif kvm = nkvm; vmcore = std::move(filename); - current_inferior()->push_target (&fbsd_kvm_ops); - - /* Pop the target automatically upon failure. */ target_unpush_up unpusher; - unpusher.reset (&fbsd_kvm_ops); + inf = current_inferior(); + inf->push_target (&fbsd_kvm_ops); + + if (inf->pid == 0) { + inferior_appeared(inf, 1); + inf->fake_pid_p = 1; + } /* * Determine the first address in KVA. Newer kernels export * VM_MAXUSER_ADDRESS and the first kernel address can be * determined by adding one. Older kernels do not provide a * symbol that is valid on all platforms, but kernbase is close * for most platforms. */ try { kernstart = parse_and_eval_address("vm_maxuser_address") + 1; } catch (const gdb_exception_error &e) { kernstart = kgdb_lookup("kernbase"); } - try { - CORE_ADDR osreldatesym = kgdb_lookup("osreldate"); - osreldate = read_memory_unsigned_integer(osreldatesym, 4, - gdbarch_byte_order (target_gdbarch ())); - } catch (const gdb_exception_error &e) { - error ("Failed to look up osreldate"); - } + osreldate = parse_and_eval_long("osreldate"); /* * Look up symbols needed for stoppcbs handling, but don't * fail if they aren't present. */ stoppcbs = kgdb_lookup("stoppcbs"); - if (osreldate > 1400088) { + if (osreldate >= 1400088) { /* stoppcbs is now a pointer rather than an array. */ try { stoppcbs = read_memory_typed_address(stoppcbs, builtin_type(target_gdbarch())->builtin_data_ptr); } catch (const gdb_exception_error &e) { stoppcbs = 0; } } try { pcb_size = parse_and_eval_long("pcb_size"); } catch (const gdb_exception_error &e) { pcb_size = 0; } if (pcb_size == 0) { try { pcb_size = parse_and_eval_long("sizeof(struct pcb)"); } catch (const gdb_exception_error &e) { #ifdef HAVE_KVM_OPEN2 if (kvm_native(nkvm)) pcb_size = sizeof(struct pcb); else pcb_size = 0; #else pcb_size = sizeof(struct pcb); #endif } } kgdb_dmesg(); - inf = current_inferior(); - if (inf->pid == 0) { - inferior_appeared(inf, 1); - inf->fake_pid_p = 1; - } - solib_create_inferior_hook(0); kt = kgdb_thr_init(ops->cpu_pcb_addr); thread_info *curthr = nullptr; while (kt != NULL) { thread_info *thr = add_thread_silent(&fbsd_kvm_ops, fbsd_vmcore_ptid(kt->tid)); if (kt == curkthr) curthr = thr; kt = kgdb_thr_next(kt); } switch_to_thread (curthr); + unpusher.release (); + + post_create_inferior (from_tty); + target_fetch_registers (get_current_regcache (), -1); reinit_frame_cache (); print_stack_frame (get_selected_frame (NULL), 0, SRC_AND_LOC, 1); - - /* Keep the target pushed. */ - unpusher.release (); } void fbsd_kvm_target::close() { if (kvm != NULL) { switch_to_no_thread (); - exit_inferior_silent (current_inferior ()); + exit_inferior (current_inferior ()); clear_solib(); if (kvm_close(kvm) != 0) warning("cannot close \"%s\": %s", vmcore.c_str (), kvm_geterr(kvm)); kvm = NULL; vmcore.clear (); } } #if 0 static void kgdb_trgt_detach(struct target_ops *ops, const char *args, int from_tty) { if (args) error ("Too many arguments"); unpush_target(&kgdb_trgt_ops); reinit_frame_cache(); if (from_tty) gdb_printf("No vmcore file now.\n"); } #endif const char * fbsd_kvm_target::extra_thread_info(thread_info *ti) { return (kgdb_thr_extra_thread_info(ti->ptid.tid())); } bool fbsd_kvm_target::has_memory () { return (kvm != NULL); } bool fbsd_kvm_target::has_stack () { return (kvm != NULL); } bool fbsd_kvm_target::has_registers () { return (kvm != NULL); } void fbsd_kvm_target::files_info() { gdb_printf ("\t`%s', ", vmcore.c_str ()); gdb_stdout->wrap_here (8); gdb_printf ("file type %s.\n", "FreeBSD kernel vmcore"); } std::string fbsd_kvm_target::pid_to_str(ptid_t ptid) { return string_printf (_("Thread %ld"), ptid.tid ()); } bool fbsd_kvm_target::thread_alive(ptid_t ptid) { return (kgdb_thr_lookup_tid(ptid.tid()) != NULL); } void fbsd_kvm_target::fetch_registers(struct regcache *regcache, int regnum) { struct fbsd_vmcore_ops *ops = get_fbsd_vmcore_ops (target_gdbarch ()); struct kthr *kt; if (ops->supply_pcb == NULL) return; kt = kgdb_thr_lookup_tid(regcache->ptid().tid()); if (kt == NULL) return; ops->supply_pcb(regcache, kt->pcb); } enum target_xfer_status fbsd_kvm_target::xfer_partial(enum target_object object, const char *annex, gdb_byte *readbuf, const gdb_byte *writebuf, ULONGEST offset, ULONGEST len, ULONGEST *xfered_len) { ssize_t nbytes; gdb_assert(kvm != NULL); switch (object) { case TARGET_OBJECT_MEMORY: nbytes = len; if (readbuf != NULL) #ifdef HAVE_KVM_OPEN2 nbytes = kvm_read2(kvm, offset, readbuf, len); #else nbytes = kvm_read(kvm, offset, readbuf, len); #endif if (writebuf != NULL && len > 0) nbytes = kvm_write(kvm, offset, writebuf, len); if (nbytes < 0) return TARGET_XFER_E_IO; if (nbytes == 0) return TARGET_XFER_EOF; *xfered_len = nbytes; return TARGET_XFER_OK; default: return TARGET_XFER_E_IO; } } static void kgdb_switch_to_thread(const char *arg, int tid) { - struct thread_info *tp; - - tp = find_thread_ptid (&fbsd_kvm_ops, fbsd_vmcore_ptid (tid)); + struct thread_info *tp = fbsd_kvm_ops.find_thread (fbsd_vmcore_ptid (tid)); if (tp == NULL) error ("invalid tid"); thread_select (arg, tp); } static void kgdb_set_proc_cmd (const char *arg, int from_tty) { CORE_ADDR addr; struct kthr *thr; if (!arg) error_no_arg ("proc address for the new context"); if (kvm == NULL) error ("only supported for core file target"); addr = parse_and_eval_address (arg); if (addr < kernstart) { thr = kgdb_thr_lookup_pid((int)addr); if (thr == NULL) error ("invalid pid"); } else { thr = kgdb_thr_lookup_paddr(addr); if (thr == NULL) error("invalid proc address"); } kgdb_switch_to_thread(arg, thr->tid); } static void kgdb_set_tid_cmd (const char *arg, int from_tty) { CORE_ADDR addr; struct kthr *thr; if (!arg) error_no_arg ("TID or thread address for the new context"); addr = (CORE_ADDR) parse_and_eval_address (arg); if (kvm != NULL && addr >= kernstart) { thr = kgdb_thr_lookup_taddr(addr); if (thr == NULL) error("invalid thread address"); addr = thr->tid; } kgdb_switch_to_thread(arg, addr); } void _initialize_kgdb_target (); void _initialize_kgdb_target () { add_target(fbsd_kvm_target_info, fbsd_kvm_target_open, filename_completer); add_com ("proc", class_obscure, kgdb_set_proc_cmd, "Set current process context"); add_com ("tid", class_obscure, kgdb_set_tid_cmd, "Set current thread context"); } CORE_ADDR kgdb_trgt_stop_pcb(u_int cpuid) { if (stoppcbs == 0 || pcb_size == 0) return 0; return (stoppcbs + pcb_size * cpuid); } diff --git a/devel/gdb/files/kgdb/kgdb-main.c b/devel/gdb/files/kgdb/kgdb-main.c index 22a219027785..07dbf0a8dccd 100644 --- a/devel/gdb/files/kgdb/kgdb-main.c +++ b/devel/gdb/files/kgdb/kgdb-main.c @@ -1,410 +1,374 @@ /* * Copyright (c) 2004 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* libgdb stuff. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "defs.h" +#include "interps.h" +#include "main.h" +#include "osabi.h" +#include "run-on-main-thread.h" #include "serial.h" -#include -#include -#include -#include -#include -#include +#include +#include #include "kgdb.h" static int verbose; static char crashdir[PATH_MAX]; static char *dumpnr; static char *kernel; static char *remote; static char *vmcore; -/* - * TODO: - * - test remote kgdb (see if threads and klds work) - * - possibly split kthr.c out into a separate thread_stratum target that - * uses new_objfile test to push itself when a FreeBSD kernel is loaded - * (check for kernel osabi) (probably don't bother with this) - * + test alternate kgdb_lookup() - * + fix kgdb build on amd64 to include i386 cross-debug support - * - propose expanded libkvm interface that supports cross-debug and moves - * MD bits of kgdb into the library (examining PCB's and exporting a - * stable-ABI struct of registers, similarly for trapframe handling and - * stop-pcb stuff - * + use tid's as lwp IDs instead of PIDs in ptid's - */ - static void usage(void) { fprintf(stderr, "usage: %s [-afqvw] [-b rate] [-d crashdir] [-c core | -n dumpnr | -r device]\n" "\t[kernel [core]]\n", getprogname()); exit(1); } static void kernel_from_dumpnr(const char *nr) { char line[PATH_MAX], path[PATH_MAX]; FILE *info; char *dir; struct stat st; int l; /* * If there's a kernel image right here in the crash directory, then * use it. The kernel image is either called kernel. or is in a * subdirectory kernel. and called kernel. The latter allows us * to collect the modules in the same place. */ snprintf(path, sizeof(path), "%s/kernel.%s", crashdir, nr); if (stat(path, &st) == 0) { if (S_ISREG(st.st_mode)) { kernel = strdup(path); return; } if (S_ISDIR(st.st_mode)) { snprintf(path, sizeof(path), "%s/kernel.%s/kernel", crashdir, nr); if (stat(path, &st) == 0 && S_ISREG(st.st_mode)) { kernel = strdup(path); return; } } } /* * No kernel image here. Parse the dump header. The kernel object * directory can be found there and we probably have the kernel * image still in it. The object directory may also have a kernel * with debugging info (called either kernel.full or kernel.debug). * If we have a debug kernel, use it. */ snprintf(path, sizeof(path), "%s/info.%s", crashdir, nr); info = fopen(path, "r"); if (info == NULL) { warn("%s", path); return; } while (fgets(line, sizeof(line), info) != NULL) { l = strlen(line); if (l > 0 && line[l - 1] == '\n') line[--l] = '\0'; if (strncmp(line, " ", 4) == 0) { fclose(info); dir = strchr(line, ':'); dir = (dir == NULL) ? line + 4 : dir + 1; /* * Check for kernel.full first as if it exists * kernel.debug will also exist, but will only * contain debug symbols and not be recognized * as a valid kernel by the osabi sniffer. */ snprintf(path, sizeof(path), "%s/kernel.full", dir); if (stat(path, &st) == 0 && S_ISREG(st.st_mode)) { kernel = strdup(path); return; } snprintf(path, sizeof(path), "%s/kernel.debug", dir); if (stat(path, &st) == 0 && S_ISREG(st.st_mode)) { kernel = strdup(path); return; } snprintf(path, sizeof(path), "%s/kernel", dir); if (stat(path, &st) == 0 && S_ISREG(st.st_mode)) { kernel = strdup(path); return; } return; } } fclose(info); } /* * Remote targets can support any number of syntaxes and we want to * support them all with one addition: we support specifying a device * node for a serial device without the "/dev/" prefix. * * What we do is to stat(2) the existing remote target first. If that * fails, we try it with "/dev/" prepended. If that succeeds we use * the resulting path, otherwise we use the original target. If * either stat(2) succeeds make sure the file is either a character * device or a FIFO. */ static void verify_remote(void) { char path[PATH_MAX]; struct stat st; if (stat(remote, &st) != 0) { snprintf(path, sizeof(path), "/dev/%s", remote); if (stat(path, &st) != 0) return; free(remote); remote = strdup(path); } if (!S_ISCHR(st.st_mode) && !S_ISFIFO(st.st_mode)) errx(1, "%s: not a special file, FIFO or socket", remote); } static void add_arg(struct captured_main_args *args, char const *arg) { args->argc++; args->argv = (char **)reallocf(args->argv, (args->argc + 1) * sizeof(char *)); if (args->argv == NULL) err(1, "Out of memory building argument list"); args->argv[args->argc] = (char *)arg; } int main(int argc, char *argv[]) { char path[PATH_MAX]; struct stat st; struct captured_main_args args; char *s; int a, ch, writeable; dumpnr = NULL; writeable = 0; strlcpy(crashdir, "/var/crash", sizeof(crashdir)); s = getenv("KGDB_CRASH_DIR"); if (s != NULL) strlcpy(crashdir, s, sizeof(crashdir)); /* Convert long options into short options. */ for (a = 1; a < argc; a++) { s = argv[a]; if (s[0] == '-') { s++; /* Long options take either 1 or 2 dashes. */ if (s[0] == '-') s++; if (strcmp(s, "quiet") == 0) argv[a] = (char *)"-q"; else if (strcmp(s, "fullname") == 0) argv[a] = (char *)"-f"; } } kgdb_quiet = 0; memset (&args, 0, sizeof args); args.interpreter_p = INTERP_CONSOLE; args.argv = (char **)xmalloc(sizeof(char *)); args.argv[0] = argv[0]; while ((ch = getopt(argc, argv, "ab:c:d:fn:qr:vw")) != -1) { switch (ch) { case 'a': annotation_level++; break; case 'b': { int i; char *p; i = strtol(optarg, &p, 0); if (*p != '\0' || p == optarg) warnx("warning: could not set baud rate to `%s'.\n", optarg); else baud_rate = i; break; } case 'c': /* use given core file. */ if (vmcore != NULL) { warnx("option %c: can only be specified once", optopt); usage(); /* NOTREACHED */ } vmcore = strdup(optarg); break; case 'd': /* lookup dumps in given directory. */ strlcpy(crashdir, optarg, sizeof(crashdir)); break; case 'f': annotation_level = 1; break; case 'n': /* use dump with given number. */ dumpnr = optarg; break; case 'q': kgdb_quiet = 1; add_arg(&args, "-q"); break; case 'r': /* use given device for remote session. */ if (remote != NULL) { warnx("option %c: can only be specified once", optopt); usage(); /* NOTREACHED */ } remote = strdup(optarg); break; case 'v': /* increase verbosity. */ verbose++; break; case 'w': /* core file is writeable. */ writeable = 1; break; case '?': default: usage(); } } if (((vmcore != NULL) ? 1 : 0) + ((dumpnr != NULL) ? 1 : 0) + ((remote != NULL) ? 1 : 0) > 1) { warnx("options -c, -n and -r are mutually exclusive"); usage(); /* NOTREACHED */ } if (verbose > 1) warnx("using %s as the crash directory", crashdir); if (argc > optind) kernel = strdup(argv[optind++]); if (argc > optind && (dumpnr != NULL || remote != NULL)) { warnx("options -n and -r do not take a core file. Ignored"); optind = argc; } if (dumpnr != NULL) { snprintf(path, sizeof(path), "%s/vmcore.%s", crashdir, dumpnr); if (stat(path, &st) == -1) err(1, "%s", path); if (!S_ISREG(st.st_mode)) errx(1, "%s: not a regular file", path); vmcore = strdup(path); } else if (remote != NULL) { verify_remote(); } else if (argc > optind) { if (vmcore == NULL) vmcore = strdup(argv[optind++]); if (argc > optind) warnx("multiple core files specified. Ignored"); } else if (vmcore == NULL && kernel == NULL) { vmcore = strdup(_PATH_MEM); kernel = strdup(getbootfile()); } if (verbose) { if (vmcore != NULL) warnx("core file: %s", vmcore); if (remote != NULL) warnx("device file: %s", remote); if (kernel != NULL) warnx("kernel image: %s", kernel); } /* A remote target requires an explicit kernel argument. */ if (remote != NULL && kernel == NULL) { warnx("remote debugging requires a kernel"); usage(); /* NOTREACHED */ } /* If we don't have a kernel image yet, try to find one. */ if (kernel == NULL) { if (dumpnr != NULL) kernel_from_dumpnr(dumpnr); if (kernel == NULL) errx(1, "couldn't find a suitable kernel image"); if (verbose) warnx("kernel image: %s", kernel); } /* Set an alternate prompt. */ add_arg(&args, "-iex"); add_arg(&args, "set prompt (kgdb) "); /* Change osabi to assume a FreeBSD kernel. */ add_arg(&args, "-iex"); add_arg(&args, "set osabi FreeBSD/kernel"); /* Open the vmcore if requested. */ if (vmcore != NULL) { add_arg(&args, "-ex"); if (asprintf(&s, "target vmcore %s%s", writeable ? "-w " : "", vmcore) < 0) err(1, "couldn't build command line"); add_arg(&args, s); } /* Open the remote target if requested. */ if (remote != NULL) { add_arg(&args, "-ex"); if (asprintf(&s, "target remote %s", remote) < 0) err(1, "couldn't build command line"); add_arg(&args, s); } add_arg(&args, kernel); /* The libgdb code uses optind too. Reset it... */ optind = 0; /* Terminate argv list. */ add_arg(&args, NULL); + gdb_assert (is_main_thread ()); return (gdb_main(&args)); } diff --git a/devel/gdb/files/patch-gdb_fbsd-nat.c b/devel/gdb/files/patch-gdb_fbsd-nat.c deleted file mode 100644 index 40fcdf0cf6e2..000000000000 --- a/devel/gdb/files/patch-gdb_fbsd-nat.c +++ /dev/null @@ -1,17 +0,0 @@ ---- gdb/fbsd-nat.c.orig 2019-05-11 11:19:03.000000000 -0700 -+++ gdb/fbsd-nat.c 2019-05-24 16:25:52.961523000 -0700 -@@ -1178,6 +1178,14 @@ fbsd_nat_target::resume (ptid_t ptid, int step, enum g - /* If ptid is a specific LWP, suspend all other LWPs in the process. */ - inferior *inf = find_inferior_ptid (ptid); - -+#ifndef PT_LWP_EVENTS -+ /* When LWP events are not supported, a new thread might already be -+ running that has not yet reported an event when GDB wishes to -+ only run a single thread. Force an update of the thread list -+ to ensure that any such threads are suspended before the process -+ is resumed. */ -+ fbsd_add_threads (ptid.pid ()); -+#endif - for (thread_info *tp : inf->non_exited_threads ()) - { - int request; diff --git a/devel/gdb/pkg-plist b/devel/gdb/pkg-plist index 182c8ef3c9ee..a25ac1fd9528 100644 --- a/devel/gdb/pkg-plist +++ b/devel/gdb/pkg-plist @@ -1,97 +1,141 @@ %%GDB_LINK%%bin/gdb %%GDB_LINK%%%%KGDB%%bin/kgdb bin/gdb%%VER%% %%TUI%%bin/gdbtui%%VER%% %%KGDB%%bin/kgdb%%VER%% %%GDB_LINK%%share/man/man1/gdb.1.gz share/man/man1/gdb%%VER%%.1.gz %%GDB_LINK%%%%KGDB%%share/man/man1/kgdb.1.gz %%KGDB%%share/man/man1/kgdb%%VER%%.1.gz %%LIBCXX%%%%DATADIR%%/auto-load%%LIBCXX_DIR%%/libc++.so.1-gdb.py %%LIBCXX%%%%DATADIR%%/auto-load%%LIBCXX_DIR%%/libc++.so.1-gdb.pyc %%PYTHON%%%%DATADIR%%/python/gdb/__init__.py %%PYTHON%%%%DATADIR%%/python/gdb/__init__.pyc %%PYTHON%%%%DATADIR%%/python/gdb/FrameDecorator.py %%PYTHON%%%%DATADIR%%/python/gdb/FrameDecorator.pyc %%PYTHON%%%%DATADIR%%/python/gdb/FrameIterator.py %%PYTHON%%%%DATADIR%%/python/gdb/FrameIterator.pyc %%PYTHON%%%%DATADIR%%/python/gdb/disassembler.py %%PYTHON%%%%DATADIR%%/python/gdb/disassembler.pyc %%PYTHON%%%%DATADIR%%/python/gdb/frames.py %%PYTHON%%%%DATADIR%%/python/gdb/frames.pyc %%PYTHON%%%%DATADIR%%/python/gdb/printing.py %%PYTHON%%%%DATADIR%%/python/gdb/prompt.py %%PYTHON%%%%DATADIR%%/python/gdb/prompt.pyc %%PYTHON%%%%DATADIR%%/python/gdb/printing.pyc %%PYTHON%%%%DATADIR%%/python/gdb/styling.py %%PYTHON%%%%DATADIR%%/python/gdb/styling.pyc %%PYTHON%%%%DATADIR%%/python/gdb/types.py %%PYTHON%%%%DATADIR%%/python/gdb/types.pyc %%PYTHON%%%%DATADIR%%/python/gdb/unwinder.py %%PYTHON%%%%DATADIR%%/python/gdb/unwinder.pyc %%PYTHON%%%%DATADIR%%/python/gdb/xmethod.py %%PYTHON%%%%DATADIR%%/python/gdb/xmethod.pyc %%PYTHON%%%%DATADIR%%/python/gdb/command/__init__.py %%PYTHON%%%%DATADIR%%/python/gdb/command/__init__.pyc %%PYTHON%%%%DATADIR%%/python/gdb/command/explore.py %%PYTHON%%%%DATADIR%%/python/gdb/command/explore.pyc %%PYTHON%%%%DATADIR%%/python/gdb/command/frame_filters.py %%PYTHON%%%%DATADIR%%/python/gdb/command/frame_filters.pyc %%PYTHON%%%%DATADIR%%/python/gdb/command/pretty_printers.py %%PYTHON%%%%DATADIR%%/python/gdb/command/pretty_printers.pyc %%PYTHON%%%%DATADIR%%/python/gdb/command/prompt.py %%PYTHON%%%%DATADIR%%/python/gdb/command/prompt.pyc %%PYTHON%%%%DATADIR%%/python/gdb/command/type_printers.py %%PYTHON%%%%DATADIR%%/python/gdb/command/type_printers.pyc %%PYTHON%%%%DATADIR%%/python/gdb/command/unwinders.py %%PYTHON%%%%DATADIR%%/python/gdb/command/unwinders.pyc %%PYTHON%%%%DATADIR%%/python/gdb/command/xmethods.py %%PYTHON%%%%DATADIR%%/python/gdb/command/xmethods.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/__init__.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/__init__.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/breakpoint.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/breakpoint.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/bt.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/bt.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/disassemble.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/disassemble.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/evaluate.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/evaluate.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/events.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/events.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/frames.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/frames.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/io.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/io.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/launch.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/launch.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/locations.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/locations.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/memory.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/memory.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/modules.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/modules.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/next.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/next.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/pause.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/pause.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/scopes.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/scopes.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/server.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/server.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/sources.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/sources.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/startup.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/startup.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/state.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/state.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/threads.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/threads.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/typecheck.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/typecheck.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/dap/varref.py +%%PYTHON%%%%DATADIR%%/python/gdb/dap/varref.pyc %%PYTHON%%%%DATADIR%%/python/gdb/function/__init__.py %%PYTHON%%%%DATADIR%%/python/gdb/function/__init__.pyc %%PYTHON%%%%DATADIR%%/python/gdb/function/as_string.py %%PYTHON%%%%DATADIR%%/python/gdb/function/as_string.pyc %%PYTHON%%%%DATADIR%%/python/gdb/function/caller_is.py %%PYTHON%%%%DATADIR%%/python/gdb/function/caller_is.pyc %%PYTHON%%%%DATADIR%%/python/gdb/function/strfns.py %%PYTHON%%%%DATADIR%%/python/gdb/function/strfns.pyc %%PYTHON%%%%DATADIR%%/python/gdb/printer/__init__.py %%PYTHON%%%%DATADIR%%/python/gdb/printer/__init__.pyc %%PYTHON%%%%DATADIR%%/python/gdb/printer/bound_registers.py %%PYTHON%%%%DATADIR%%/python/gdb/printer/bound_registers.pyc %%GUILE%%%%DATADIR%%/guile/gdb.go %%GUILE%%%%DATADIR%%/guile/gdb.scm %%GUILE%%%%DATADIR%%/guile/gdb/boot.scm %%GUILE%%%%DATADIR%%/guile/gdb/experimental.go %%GUILE%%%%DATADIR%%/guile/gdb/experimental.scm %%GUILE%%%%DATADIR%%/guile/gdb/init.scm %%GUILE%%%%DATADIR%%/guile/gdb/iterator.go %%GUILE%%%%DATADIR%%/guile/gdb/iterator.scm %%GUILE%%%%DATADIR%%/guile/gdb/printing.go %%GUILE%%%%DATADIR%%/guile/gdb/printing.scm %%GUILE%%%%DATADIR%%/guile/gdb/support.go %%GUILE%%%%DATADIR%%/guile/gdb/support.scm %%GUILE%%%%DATADIR%%/guile/gdb/types.go %%GUILE%%%%DATADIR%%/guile/gdb/types.scm %%DATADIR%%/syscalls/aarch64-linux.xml %%DATADIR%%/syscalls/amd64-linux.xml %%DATADIR%%/syscalls/arm-linux.xml %%DATADIR%%/syscalls/freebsd.xml %%DATADIR%%/syscalls/gdb-syscalls.dtd %%DATADIR%%/syscalls/i386-linux.xml %%DATADIR%%/syscalls/mips-n32-linux.xml %%DATADIR%%/syscalls/mips-n64-linux.xml %%DATADIR%%/syscalls/mips-o32-linux.xml %%DATADIR%%/syscalls/netbsd.xml %%DATADIR%%/syscalls/ppc-linux.xml %%DATADIR%%/syscalls/ppc64-linux.xml %%DATADIR%%/syscalls/s390-linux.xml %%DATADIR%%/syscalls/s390x-linux.xml %%DATADIR%%/syscalls/sparc-linux.xml %%DATADIR%%/syscalls/sparc64-linux.xml %%LIBCXX%%share/libcxx-gdbpy/libcxx/__init__.py %%LIBCXX%%share/libcxx-gdbpy/libcxx/__init__.pyc %%LIBCXX%%share/libcxx-gdbpy/libcxx/printers.py %%LIBCXX%%share/libcxx-gdbpy/libcxx/printers.pyc %%LIBCXX%%share/libcxx-gdbpy/libcxx/xmethods.py %%LIBCXX%%share/libcxx-gdbpy/libcxx/xmethods.pyc