This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [PATCH] Merge GCC producer parsers. Allow digits in identifiers.
- From: Mark Wielaard <mjw at redhat dot com>
- To: Joel Brobecker <brobecker at adacore dot com>
- Cc: gdb-patches at sourceware dot org
- Date: Wed, 04 Feb 2015 18:19:44 +0100
- Subject: Re: [PATCH] Merge GCC producer parsers. Allow digits in identifiers.
- Authentication-results: sourceware.org; auth=none
- References: <1422185341-20243-1-git-send-email-mjw at redhat dot com> <20150129080018 dot GH5193 at adacore dot com> <1422535409 dot 4947 dot 5 dot camel at bordewijk dot wildebeest dot org>
On Thu, 2015-01-29 at 13:43 +0100, Mark Wielaard wrote:
> On Thu, 2015-01-29 at 12:00 +0400, Joel Brobecker wrote:
> > Looking at the function, it seems to me that the current design of
> > the function is a little strange: Named "producer_is_gcc", it'd expect
> > the return value to be a boolean. So, if the function returned that
> > and had an extra parameter for getting the major, the issue would
> > not arise:
> >
> > else if (producer_is_gcc (cu->producer, &major, &minor))
> >
> > I think you chose this approach out of consistency with
> > producer_is_gcc_ge_4, which is why I'm OK with the current patch.
> > But if I were to look into this, what I would do replace the two
> > calls to this function with calls to your new function.
> >
> > I might also allow major/minor to be NULL to spare users the need
> > to create variables that they will not need afterwards.
> >
> > So, to sumarize, push as is, and then let's clean this up (you don't
> > have to do the cleanup, if you don't want to, but let me know if you
> > pass, as I'd like to take over if you do).
>
> Thanks, I pushed as is. You observations are correct.
> I'll refactor this as you suggest in a separate patch.
How about the following cleanup:
Change producer_is_gcc function return type to bool.
gdb/ChangeLog:
* utils.h (producer_is_gcc): Change return type to bool. Add major
argument.
* utils.c (producer_is_gcc): Likewise.
(producer_is_gcc_ge_4): Adjust producer_is_gcc call.
* dwarf2read.c (check_producer): Likewise.
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 0d8026f..eb8541f 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -12293,7 +12293,7 @@ check_producer (struct dwarf2_cu *cu)
combination. gcc-4.5.x -gdwarf-4 binaries have DW_AT_accessibility
interpreted incorrectly by GDB now - GCC PR debug/48229. */
}
- else if ((major = producer_is_gcc (cu->producer, &minor)) > 0)
+ else if (producer_is_gcc (cu->producer, &major, &minor))
{
cu->producer_is_gxx_lt_4_6 = major < 4 || (major == 4 && minor < 6);
cu->producer_is_gcc_lt_4_3 = major < 4 || (major == 4 && minor < 3);
diff --git a/gdb/utils.c b/gdb/utils.c
index 909476b..99b3874 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -3259,7 +3259,8 @@ int
producer_is_gcc_ge_4 (const char *producer)
{
int major, minor;
- major = producer_is_gcc (producer, &minor);
+ if (! producer_is_gcc (producer, &major, &minor))
+ return -1;
if (major < 4)
return -1;
if (major > 4)
@@ -3267,17 +3268,22 @@ producer_is_gcc_ge_4 (const char *producer)
return minor;
}
-/* Returns the major version number if the given PRODUCER string is GCC and
- sets the MINOR version. Returns -1 if the given PRODUCER is NULL or it
- isn't GCC. */
-int
-producer_is_gcc (const char *producer, int *minor)
+/* Returns true if the given PRODUCER string is GCC and sets the MAJOR
+ and MINOR versions when not NULL. Returns false if the given PRODUCER
+ is NULL or it isn't GCC. */
+bool
+producer_is_gcc (const char *producer, int *major, int *minor)
{
const char *cs;
- int major;
if (producer != NULL && strncmp (producer, "GNU ", strlen ("GNU ")) == 0)
{
+ int maj, min;
+ if (major == NULL)
+ major = &maj;
+ if (minor == NULL)
+ minor = &min;
+
/* Skip any identifier after "GNU " - such as "C11" "C++" or "Java".
A full producer string might look like:
"GNU C 4.7.2"
@@ -3289,7 +3295,7 @@ producer_is_gcc (const char *producer, int *minor)
cs++;
if (*cs && isspace (*cs))
cs++;
- if (sscanf (cs, "%d.%d", &major, minor) == 2)
+ if (sscanf (cs, "%d.%d", major, minor) == 2)
return major;
}
diff --git a/gdb/utils.h b/gdb/utils.h
index 6724d7c..d8afa79 100644
--- a/gdb/utils.h
+++ b/gdb/utils.h
@@ -21,6 +21,8 @@
#ifndef UTILS_H
#define UTILS_H
+#include <stdbool.h>
+
#include "exceptions.h"
extern void initialize_utils (void);
@@ -302,7 +304,7 @@ extern pid_t wait_to_die_with_timeout (pid_t pid, int *status, int timeout);
#endif
extern int producer_is_gcc_ge_4 (const char *producer);
-extern int producer_is_gcc (const char *producer, int *minor);
+extern bool producer_is_gcc (const char *producer, int *major, int *minor);
extern int myread (int, char *, int);
--
1.8.3.1