[V2] dwarf2read: move producers help functions to a dwarf specific file
Commit Message
This patch add new files for the dwarf producer checks.
It is also a preparation path to add functions to detect the icc
version that produced a given compilation unit.
2017-09-18 Walfred Tedeschi <walfred.tedeschi@intel.com>
* Makefile.in (SFILES): Add producer.c.
(COMMON_OBS): Add producer.o
* amd64-tdep.c (producer.h): Add new include.
* dwarf2read.c (producer.h): Add new include.
* producer.c: New file.
* producer.h: New file.
* utils.c (producer_is_gcc, producer_is_gcc_ge_4): Move to
producer.c.
* utils.h (producer_is_gcc, producer_is_gcc_ge_4): Move to
producer.h.
---
gdb/Makefile.in | 2 ++
gdb/amd64-tdep.c | 1 +
gdb/dwarf2read.c | 1 +
gdb/producer.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
gdb/producer.h | 34 ++++++++++++++++++++++++
gdb/utils.c | 54 ---------------------------------------
gdb/utils.h | 3 ---
7 files changed, 116 insertions(+), 57 deletions(-)
create mode 100644 gdb/producer.c
create mode 100644 gdb/producer.h
Comments
On 09/25/2017 03:51 PM, Walfred Tedeschi wrote:
> This patch add new files for the dwarf producer checks.
Not for the dwarf producer checks, but for the producer parsing.
Please update.
> +#include "defs.h"
> +#include "producer.h"
> +#include "utils.h"
> +
> +#if defined GDB_SELF_TEST
> +#include "selftest.h"
> +#endif
This "selftest.h" inclusion doesn't belong in this patch.
Please move it to the other patch, which actually adds the
selftests.
Otherwise OK. Please push (this patch) once fixed.
Thanks,
Pedro Alves
@@ -1170,6 +1170,7 @@ SFILES = \
parse.c \
printcmd.c \
probe.c \
+ producer.c \
proc-service.list \
progspace.c \
progspace-and-thread.c \
@@ -1792,6 +1793,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
print-utils.o \
printcmd.o \
probe.o \
+ producer.o \
progspace.o \
progspace-and-thread.o \
prologue-value.o \
@@ -43,6 +43,7 @@
#include <algorithm>
#include "target-descriptions.h"
#include "arch/amd64.h"
+#include "producer.h"
#include "ax.h"
#include "ax-gdb.h"
@@ -75,6 +75,7 @@
#include "common/underlying.h"
#include "common/byte-vector.h"
#include "filename-seen-cache.h"
+#include "producer.h"
#include <fcntl.h>
#include <sys/types.h>
#include <algorithm>
new file mode 100644
@@ -0,0 +1,78 @@
+/* Producer string parser for GDB.
+
+ Copyright (C) 2012-2017 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+#include "producer.h"
+#include "utils.h"
+
+#if defined GDB_SELF_TEST
+#include "selftest.h"
+#endif
+
+/* See documentation in the producer.h file. */
+
+int
+producer_is_gcc_ge_4 (const char *producer)
+{
+ int major, minor;
+
+ if (! producer_is_gcc (producer, &major, &minor))
+ return -1;
+ if (major < 4)
+ return -1;
+ if (major > 4)
+ return INT_MAX;
+ return minor;
+}
+
+/* See documentation in the producer.h file. */
+
+int
+producer_is_gcc (const char *producer, int *major, int *minor)
+{
+ const char *cs;
+
+ if (producer != NULL && startswith (producer, "GNU "))
+ {
+ 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"
+ "GNU Fortran 4.8.2 20140120 (Red Hat 4.8.2-16) -mtune=generic ..."
+ "GNU C++14 5.0.0 20150123 (experimental)"
+ */
+ cs = &producer[strlen ("GNU ")];
+ while (*cs && !isspace (*cs))
+ cs++;
+ if (*cs && isspace (*cs))
+ cs++;
+ if (sscanf (cs, "%d.%d", major, minor) == 2)
+ return 1;
+ }
+
+ /* Not recognized as GCC. */
+ return 0;
+}
+
new file mode 100644
@@ -0,0 +1,34 @@
+/* Producer string parser for GDB.
+
+ Copyright (C) 2012-2017 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef PRODUCER_H
+#define PRODUCER_H
+
+/* Check for GCC >= 4.x according to the symtab->producer string. Return minor
+ version (x) of 4.x in such case. If it is not GCC or it is GCC older than
+ 4.x return -1. If it is GCC 5.x or higher return INT_MAX. */
+extern int producer_is_gcc_ge_4 (const char *producer);
+
+
+/* Returns nonzero if the given PRODUCER string is GCC and sets the MAJOR
+ and MINOR versions when not NULL. Returns zero if the given PRODUCER
+ is NULL or it isn't GCC. */
+extern int producer_is_gcc (const char *producer, int *major, int *minor);
+
+#endif
@@ -2944,60 +2944,6 @@ make_bpstat_clear_actions_cleanup (void)
return make_cleanup (do_bpstat_clear_actions_cleanup, NULL);
}
-/* Check for GCC >= 4.x according to the symtab->producer string. Return minor
- version (x) of 4.x in such case. If it is not GCC or it is GCC older than
- 4.x return -1. If it is GCC 5.x or higher return INT_MAX. */
-
-int
-producer_is_gcc_ge_4 (const char *producer)
-{
- int major, minor;
-
- if (! producer_is_gcc (producer, &major, &minor))
- return -1;
- if (major < 4)
- return -1;
- if (major > 4)
- return INT_MAX;
- return minor;
-}
-
-/* Returns nonzero if the given PRODUCER string is GCC and sets the MAJOR
- and MINOR versions when not NULL. Returns zero if the given PRODUCER
- is NULL or it isn't GCC. */
-
-int
-producer_is_gcc (const char *producer, int *major, int *minor)
-{
- const char *cs;
-
- if (producer != NULL && startswith (producer, "GNU "))
- {
- int maj, min;
-
- if (major == NULL)
- major = &maj;
- if (minor == NULL)
- minor = &min;
-
- /* Skip any identifier after "GNU " - such as "C11" or "C++".
- A full producer string might look like:
- "GNU C 4.7.2"
- "GNU Fortran 4.8.2 20140120 (Red Hat 4.8.2-16) -mtune=generic ..."
- "GNU C++14 5.0.0 20150123 (experimental)"
- */
- cs = &producer[strlen ("GNU ")];
- while (*cs && !isspace (*cs))
- cs++;
- if (*cs && isspace (*cs))
- cs++;
- if (sscanf (cs, "%d.%d", major, minor) == 2)
- return 1;
- }
-
- /* Not recognized as GCC. */
- return 0;
-}
/* Helper for make_cleanup_free_char_ptr_vec. */
@@ -442,9 +442,6 @@ void dummy_obstack_deallocate (void *object, void *data);
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 *major, int *minor);
-
extern int myread (int, char *, int);
/* Ensure that V is aligned to an N byte boundary (B's assumed to be a