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