]>
Commit | Line | Data |
---|---|---|
51a5ef0f PS |
1 | http://sourceware.org/ml/gdb-patches/2010-01/msg00558.html |
2 | Subject: Re: [patch] print a more useful error message for "gdb core" | |
3 | ||
4 | [ Fixed up since the mail. ] | |
5 | ||
6 | On Thu, 21 Jan 2010 18:17:15 +0100, Doug Evans wrote: | |
7 | > Not an exhaustive list, but if we go down the path of converting "gdb | |
8 | > corefile" to "gdb -c corefile", then we also need to think about "file | |
9 | > corefile" being converted to "core corefile" [or "target core | |
10 | > corefile", "core" is apparently deprecated in favor of "target core"] | |
11 | > and "target exec corefile" -> "target core corefile". Presumably | |
12 | > "file corefile" (and "target exec corefile") would discard the | |
13 | > currently selected executable. But maybe not. Will that be confusing | |
14 | > for users? I don't know. | |
15 | ||
16 | While thinking about it overriding some GDB _commands_ was not my intention. | |
17 | ||
18 | There is a general assumption if I have a shell COMMAND and some FILE I can do | |
19 | $ COMMAND FILE | |
20 | and COMMAND will appropriately load the FILE. | |
21 | ||
22 | FSF GDB currently needs to specify also the executable file for core files | |
23 | which already inhibits this intuitive expectation. OTOH with the build-id | |
24 | locating patch which could allow such intuitive start notneeding the | |
25 | executable file. Still it currently did not work due to the required "-c": | |
26 | $ COMMAND -c COREFILE | |
27 | ||
28 | Entering "file", "core-file" or "attach" commands is already explicit enough | |
29 | so that it IMO should do what the command name says without any | |
30 | autodetections. The second command line argument | |
31 | (captured_main->pid_or_core_arg) is also autodetected (for PID or CORE) but | |
32 | neither "attach" accepts a core file nor "core-file" accepts a PID. | |
33 | ||
34 | ||
35 | The patch makes sense only with the build-id patchset so this is not submit | |
36 | for FSF GDB inclusion yet. I am fine with your patch (+/- Hui Zhu's pending | |
37 | bfd_check_format_matches) as the patch below is its natural extension. | |
38 | ||
39 | ||
40 | Sorry for the delay, | |
41 | Jan | |
42 | ||
43 | ||
44 | 2010-01-25 Jan Kratochvil <jan.kratochvil@redhat.com> | |
45 | ||
46 | * exceptions.h (enum errors <IS_CORE_ERROR>): New. | |
47 | * exec.c: Include exceptions.h. | |
48 | (exec_file_attach <bfd_core>): Call throw_error (IS_CORE_ERROR, ...). | |
49 | * main.c (exec_or_core_file_attach): New. | |
50 | (captured_main <optind < argc>): Set also corearg. | |
51 | (captured_main <strcmp (execarg, symarg) == 0>): New variable func. | |
52 | Call exec_or_core_file_attach if COREARG matches EXECARG. Call | |
53 | symbol_file_add_main only if CORE_BFD remained NULL. | |
54 | ||
55 | Http://sourceware.org/ml/gdb-patches/2010-01/msg00517.html | |
56 | 2010-01-20 Doug Evans <dje@google.com> | |
57 | ||
58 | * exec.c (exec_file_attach): Print a more useful error message if the | |
59 | user did "gdb core". | |
60 | ||
03ffe914 | 61 | Index: gdb-7.5.91.20130323/gdb/exceptions.h |
51a5ef0f | 62 | =================================================================== |
03ffe914 JR |
63 | --- gdb-7.5.91.20130323.orig/gdb/exceptions.h 2013-03-22 21:41:45.000000000 +0100 |
64 | +++ gdb-7.5.91.20130323/gdb/exceptions.h 2013-03-23 19:49:05.738459185 +0100 | |
65 | @@ -90,6 +90,9 @@ enum errors { | |
66 | aborted as the inferior state is no longer valid. */ | |
67 | TARGET_CLOSE_ERROR, | |
51a5ef0f PS |
68 | |
69 | + /* Attempt to load a core file as executable. */ | |
70 | + IS_CORE_ERROR, | |
71 | + | |
72 | /* Add more errors here. */ | |
73 | NR_ERRORS | |
74 | }; | |
03ffe914 | 75 | Index: gdb-7.5.91.20130323/gdb/exec.c |
51a5ef0f | 76 | =================================================================== |
03ffe914 JR |
77 | --- gdb-7.5.91.20130323.orig/gdb/exec.c 2013-01-31 19:37:37.000000000 +0100 |
78 | +++ gdb-7.5.91.20130323/gdb/exec.c 2013-03-23 19:48:53.284575912 +0100 | |
a7de96f0 | 79 | @@ -34,6 +34,7 @@ |
51a5ef0f PS |
80 | #include "gdbthread.h" |
81 | #include "progspace.h" | |
a7de96f0 | 82 | #include "gdb_bfd.h" |
51a5ef0f PS |
83 | +#include "exceptions.h" |
84 | ||
85 | #include <fcntl.h> | |
86 | #include "readline/readline.h" | |
03ffe914 | 87 | @@ -240,12 +241,27 @@ exec_file_attach (char *filename, int fr |
51a5ef0f PS |
88 | |
89 | if (!bfd_check_format_matches (exec_bfd, bfd_object, &matching)) | |
90 | { | |
91 | + int is_core; | |
92 | + | |
93 | + /* If the user accidentally did "gdb core", print a useful | |
94 | + error message. Check it only after bfd_object has been checked as | |
95 | + a valid executable may get recognized for example also as | |
96 | + "trad-core". */ | |
97 | + is_core = bfd_check_format (exec_bfd, bfd_core); | |
98 | + | |
99 | /* Make sure to close exec_bfd, or else "run" might try to use | |
100 | it. */ | |
101 | exec_close (); | |
102 | - error (_("\"%s\": not in executable format: %s"), | |
103 | - scratch_pathname, | |
104 | - gdb_bfd_errmsg (bfd_get_error (), matching)); | |
105 | + | |
106 | + if (is_core != 0) | |
107 | + throw_error (IS_CORE_ERROR, | |
108 | + _("\"%s\" is a core file.\n" | |
109 | + "Please specify an executable to debug."), | |
110 | + scratch_pathname); | |
111 | + else | |
112 | + error (_("\"%s\": not in executable format: %s"), | |
113 | + scratch_pathname, | |
114 | + gdb_bfd_errmsg (bfd_get_error (), matching)); | |
115 | } | |
116 | ||
117 | /* FIXME - This should only be run for RS6000, but the ifdef is a poor | |
03ffe914 | 118 | Index: gdb-7.5.91.20130323/gdb/main.c |
51a5ef0f | 119 | =================================================================== |
03ffe914 JR |
120 | --- gdb-7.5.91.20130323.orig/gdb/main.c 2013-03-23 19:48:18.000000000 +0100 |
121 | +++ gdb-7.5.91.20130323/gdb/main.c 2013-03-23 19:48:53.285575901 +0100 | |
122 | @@ -296,6 +296,36 @@ typedef struct cmdarg { | |
a7de96f0 PS |
123 | /* Define type VEC (cmdarg_s). */ |
124 | DEF_VEC_O (cmdarg_s); | |
51a5ef0f PS |
125 | |
126 | +/* Call exec_file_attach. If it detected FILENAME is a core file call | |
127 | + core_file_command. Print the original exec_file_attach error only if | |
128 | + core_file_command failed to find a matching executable. */ | |
129 | + | |
130 | +static void | |
131 | +exec_or_core_file_attach (char *filename, int from_tty) | |
132 | +{ | |
133 | + volatile struct gdb_exception e; | |
134 | + | |
135 | + gdb_assert (exec_bfd == NULL); | |
136 | + | |
137 | + TRY_CATCH (e, RETURN_MASK_ALL) | |
138 | + { | |
139 | + exec_file_attach (filename, from_tty); | |
140 | + } | |
141 | + if (e.reason < 0) | |
142 | + { | |
143 | + if (e.error == IS_CORE_ERROR) | |
144 | + { | |
145 | + core_file_command (filename, from_tty); | |
146 | + | |
147 | + /* Iff the core file found its executable suppress the error message | |
148 | + from exec_file_attach. */ | |
149 | + if (exec_bfd != NULL) | |
150 | + return; | |
151 | + } | |
152 | + throw_exception (e); | |
153 | + } | |
154 | +} | |
155 | + | |
156 | static int | |
157 | captured_main (void *data) | |
158 | { | |
03ffe914 | 159 | @@ -796,6 +826,8 @@ captured_main (void *data) |
51a5ef0f PS |
160 | { |
161 | symarg = argv[optind]; | |
162 | execarg = argv[optind]; | |
163 | + if (optind + 1 == argc && corearg == NULL) | |
164 | + corearg = argv[optind]; | |
165 | optind++; | |
166 | } | |
167 | ||
03ffe914 | 168 | @@ -951,11 +983,25 @@ captured_main (void *data) |
51a5ef0f PS |
169 | && symarg != NULL |
170 | && strcmp (execarg, symarg) == 0) | |
171 | { | |
172 | + catch_command_errors_ftype *func; | |
173 | + | |
174 | + /* Call exec_or_core_file_attach only if the file was specified as | |
175 | + a command line argument (and not an a command line option). */ | |
176 | + if (corearg != NULL && strcmp (corearg, execarg) == 0) | |
177 | + { | |
178 | + func = exec_or_core_file_attach; | |
179 | + corearg = NULL; | |
180 | + } | |
181 | + else | |
182 | + func = exec_file_attach; | |
183 | + | |
184 | /* The exec file and the symbol-file are the same. If we can't | |
6ed6bacf AM |
185 | open it, better only print one error message. |
186 | - catch_command_errors returns non-zero on success! */ | |
187 | - if (catch_command_errors (exec_file_attach, execarg, | |
188 | - !batch_flag, RETURN_MASK_ALL)) | |
189 | + catch_command_errors returns non-zero on success! | |
51a5ef0f PS |
190 | + Do not load EXECARG as a symbol file if it has been already processed |
191 | + as a core file. */ | |
192 | + if (catch_command_errors (func, execarg, !batch_flag, RETURN_MASK_ALL) | |
193 | + && core_bfd == NULL) | |
6ed6bacf AM |
194 | catch_command_errors (symbol_file_add_main, symarg, |
195 | !batch_flag, RETURN_MASK_ALL); | |
51a5ef0f | 196 | } |