45f79714b9
- archer-jankratochvil-fedora13 commit:
39c5a8b75fad3acd7204903db5dee025055a4594
- Fix a regression on "AAA::ALPHA" test due to a merge from FSF GDB.
- Fix a regression of previous release due to false identification as core
file.
- Move ifunc .patch into the GIT-managed archer-jankratochvil-fedora13
branch.
- Update gdb.pie/corefile.exp from 2007-01-26 FSF GDB commit by Andreas
Schwab.
184 lines
6.5 KiB
Diff
184 lines
6.5 KiB
Diff
http://sourceware.org/ml/gdb-patches/2010-01/msg00558.html
|
|
Subject: Re: [patch] print a more useful error message for "gdb core"
|
|
|
|
[ Fixed up since the mail. ]
|
|
|
|
On Thu, 21 Jan 2010 18:17:15 +0100, Doug Evans wrote:
|
|
> Not an exhaustive list, but if we go down the path of converting "gdb
|
|
> corefile" to "gdb -c corefile", then we also need to think about "file
|
|
> corefile" being converted to "core corefile" [or "target core
|
|
> corefile", "core" is apparently deprecated in favor of "target core"]
|
|
> and "target exec corefile" -> "target core corefile". Presumably
|
|
> "file corefile" (and "target exec corefile") would discard the
|
|
> currently selected executable. But maybe not. Will that be confusing
|
|
> for users? I don't know.
|
|
|
|
While thinking about it overriding some GDB _commands_ was not my intention.
|
|
|
|
There is a general assumption if I have a shell COMMAND and some FILE I can do
|
|
$ COMMAND FILE
|
|
and COMMAND will appropriately load the FILE.
|
|
|
|
FSF GDB currently needs to specify also the executable file for core files
|
|
which already inhibits this intuitive expectation. OTOH with the build-id
|
|
locating patch which could allow such intuitive start notneeding the
|
|
executable file. Still it currently did not work due to the required "-c":
|
|
$ COMMAND -c COREFILE
|
|
|
|
Entering "file", "core-file" or "attach" commands is already explicit enough
|
|
so that it IMO should do what the command name says without any
|
|
autodetections. The second command line argument
|
|
(captured_main->pid_or_core_arg) is also autodetected (for PID or CORE) but
|
|
neither "attach" accepts a core file nor "core-file" accepts a PID.
|
|
|
|
|
|
The patch makes sense only with the build-id patchset so this is not submit
|
|
for FSF GDB inclusion yet. I am fine with your patch (+/- Hui Zhu's pending
|
|
bfd_check_format_matches) as the patch below is its natural extension.
|
|
|
|
|
|
Sorry for the delay,
|
|
Jan
|
|
|
|
|
|
2010-01-25 Jan Kratochvil <jan.kratochvil@redhat.com>
|
|
|
|
* exceptions.h (enum errors <IS_CORE_ERROR>): New.
|
|
* exec.c: Include exceptions.h.
|
|
(exec_file_attach <bfd_core>): Call throw_error (IS_CORE_ERROR, ...).
|
|
* main.c (exec_or_core_file_attach): New.
|
|
(captured_main <optind < argc>): Set also corearg.
|
|
(captured_main <strcmp (execarg, symarg) == 0>): New variable func.
|
|
Call exec_or_core_file_attach if COREARG matches EXECARG. Call
|
|
symbol_file_add_main only if CORE_BFD remained NULL.
|
|
|
|
Http://sourceware.org/ml/gdb-patches/2010-01/msg00517.html
|
|
2010-01-20 Doug Evans <dje@google.com>
|
|
|
|
* exec.c (exec_file_attach): Print a more useful error message if the
|
|
user did "gdb core".
|
|
|
|
Index: gdb-7.0.50.20100128/gdb/exceptions.h
|
|
===================================================================
|
|
--- gdb-7.0.50.20100128.orig/gdb/exceptions.h 2010-01-18 07:25:22.000000000 +0100
|
|
+++ gdb-7.0.50.20100128/gdb/exceptions.h 2010-01-28 22:49:00.000000000 +0100
|
|
@@ -78,6 +78,9 @@ enum errors {
|
|
/* Feature is not supported in this copy of GDB. */
|
|
UNSUPPORTED_ERROR,
|
|
|
|
+ /* Attempt to load a core file as executable. */
|
|
+ IS_CORE_ERROR,
|
|
+
|
|
/* Add more errors here. */
|
|
NR_ERRORS
|
|
};
|
|
Index: gdb-7.0.50.20100128/gdb/exec.c
|
|
===================================================================
|
|
--- gdb-7.0.50.20100128.orig/gdb/exec.c 2010-01-28 22:48:59.000000000 +0100
|
|
+++ gdb-7.0.50.20100128/gdb/exec.c 2010-01-28 22:58:45.000000000 +0100
|
|
@@ -34,6 +34,7 @@
|
|
#include "gdbthread.h"
|
|
#include "progspace.h"
|
|
#include "solib.h"
|
|
+#include "exceptions.h"
|
|
|
|
#include <fcntl.h>
|
|
#include "readline/readline.h"
|
|
@@ -258,6 +259,17 @@ exec_file_attach (char *filename, int fr
|
|
/* Make sure to close exec_bfd, or else "run" might try to use
|
|
it. */
|
|
exec_close ();
|
|
+
|
|
+ /* If the user accidentally did "gdb core", print a useful
|
|
+ error message. Check it only after bfd_object has been checked as
|
|
+ a valid executable may get recognized for example also as
|
|
+ "trad-core". */
|
|
+ if (bfd_check_format (exec_bfd, bfd_core))
|
|
+ throw_error (IS_CORE_ERROR,
|
|
+ _("\"%s\" is a core file.\n"
|
|
+ "Please specify an executable to debug."),
|
|
+ scratch_pathname);
|
|
+
|
|
error (_("\"%s\": not in executable format: %s"),
|
|
scratch_pathname, bfd_errmsg (bfd_get_error ()));
|
|
}
|
|
Index: gdb-7.0.50.20100128/gdb/main.c
|
|
===================================================================
|
|
--- gdb-7.0.50.20100128.orig/gdb/main.c 2010-01-28 22:48:59.000000000 +0100
|
|
+++ gdb-7.0.50.20100128/gdb/main.c 2010-01-28 22:49:00.000000000 +0100
|
|
@@ -241,6 +241,36 @@ captured_command_loop (void *data)
|
|
return 1;
|
|
}
|
|
|
|
+/* Call exec_file_attach. If it detected FILENAME is a core file call
|
|
+ core_file_command. Print the original exec_file_attach error only if
|
|
+ core_file_command failed to find a matching executable. */
|
|
+
|
|
+static void
|
|
+exec_or_core_file_attach (char *filename, int from_tty)
|
|
+{
|
|
+ volatile struct gdb_exception e;
|
|
+
|
|
+ gdb_assert (exec_bfd == NULL);
|
|
+
|
|
+ TRY_CATCH (e, RETURN_MASK_ALL)
|
|
+ {
|
|
+ exec_file_attach (filename, from_tty);
|
|
+ }
|
|
+ if (e.reason < 0)
|
|
+ {
|
|
+ if (e.error == IS_CORE_ERROR)
|
|
+ {
|
|
+ core_file_command (filename, from_tty);
|
|
+
|
|
+ /* Iff the core file found its executable suppress the error message
|
|
+ from exec_file_attach. */
|
|
+ if (exec_bfd != NULL)
|
|
+ return;
|
|
+ }
|
|
+ throw_exception (e);
|
|
+ }
|
|
+}
|
|
+
|
|
static int
|
|
captured_main (void *data)
|
|
{
|
|
@@ -703,6 +733,8 @@ extern int gdbtk_test (char *);
|
|
{
|
|
symarg = argv[optind];
|
|
execarg = argv[optind];
|
|
+ if (optind + 1 == argc && corearg == NULL)
|
|
+ corearg = argv[optind];
|
|
optind++;
|
|
}
|
|
|
|
@@ -835,10 +867,25 @@ Excess command line arguments ignored. (
|
|
&& symarg != NULL
|
|
&& strcmp (execarg, symarg) == 0)
|
|
{
|
|
+ catch_command_errors_ftype *func;
|
|
+
|
|
+ /* Call exec_or_core_file_attach only if the file was specified as
|
|
+ a command line argument (and not an a command line option). */
|
|
+ if (corearg != NULL && strcmp (corearg, execarg) == 0)
|
|
+ {
|
|
+ func = exec_or_core_file_attach;
|
|
+ corearg = NULL;
|
|
+ }
|
|
+ else
|
|
+ func = exec_file_attach;
|
|
+
|
|
/* The exec file and the symbol-file are the same. If we can't
|
|
- open it, better only print one error message.
|
|
- catch_command_errors returns non-zero on success! */
|
|
- if (catch_command_errors (exec_file_attach, execarg, !batch, RETURN_MASK_ALL))
|
|
+ open it, better only print one error message.
|
|
+ catch_command_errors returns non-zero on success!
|
|
+ Do not load EXECARG as a symbol file if it has been already processed
|
|
+ as a core file. */
|
|
+ if (catch_command_errors (func, execarg, !batch, RETURN_MASK_ALL)
|
|
+ && core_bfd == NULL)
|
|
catch_command_errors (symbol_file_add_main, symarg, !batch, RETURN_MASK_ALL);
|
|
}
|
|
else
|