[PATCH 0/5 v7] Common code cleanups (first four, and one new)

[PATCH 0/5 v7] Common code cleanups (first four, and one new)

[Gary Benson]

Hi all,

This series contains updated versions of the first four common
cleanups patches I last posted Monday, and a new patch to deal
with issues regarding the debug_hw_points flag.

Patches 1-3 are unchanged from their previous versions.

The debug_hw_points code was moved from patch 4 into patch 5.
Patch 4 now contains only the new functions debug_printf and
debug_vprintf.  It is otherwise unchanged from the previous
version.

Patch 5 is a new patch.  gdbserver has a flag, debug_hw_points,
that switches on some debug printing in the x86 and AArch64 Linux
ports.  GDB's x86 and AArch64 Linux also define debug_hw_points,
with identical meaning, accessed via "maint set/show show-debug-regs".
GDB's Linux MIPS port also has "maint set/show show-debug-regs",
but there the variable is called maint_show_dr.  In some ports the
flag is static to one file, in other ports and in gdbserver it is
global.  Patch 5 defines one global for this, show_debug_regs, in
common-debug.h.  All other definitions are removed, and all ports
are modified to use the new global.

Is this ok to commit?

Doug, if patches 1-4 are ok please let me know (regardless of the
status of 5) so I can commit them.  (If all five are ok then great!)

Thanks,
Gary

--
http://gbenson.net/

[PATCH 3/5 v7] Move print-utils.h to common-defs.h

[Gary Benson]

This commit moves the inclusion of print-utils.h to common-defs.h
and removes all other inclusions.

gdb/
2014-08-13  Gary Benson  <gbenson@redhat.com>

	* common/common-defs.h: Include print-utils.h.
	* utils.h: Do not include print-utils.h.

gdb/gdbserver/
2014-08-13  Gary Benson  <gbenson@redhat.com>

	* utils.h: Do not include print-utils.h.
---
 gdb/ChangeLog            |    5 +++++
 gdb/common/common-defs.h |    1 +
 gdb/gdbserver/ChangeLog  |    4 ++++
 gdb/gdbserver/utils.h    |    2 --
 gdb/utils.h              |    1 -
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h
index 5543e4c..66c0d21 100644
--- a/gdb/common/common-defs.h
+++ b/gdb/common/common-defs.h
@@ -43,5 +43,6 @@
 #include "gdb_assert.h"
 #include "errors.h"
 #include "common-types.h"
+#include "print-utils.h"
 
 #endif /* COMMON_DEFS_H */
diff --git a/gdb/gdbserver/utils.h b/gdb/gdbserver/utils.h
index a994f38..cdd80df 100644
--- a/gdb/gdbserver/utils.h
+++ b/gdb/gdbserver/utils.h
@@ -19,8 +19,6 @@
 #ifndef UTILS_H
 #define UTILS_H
 
-#include "print-utils.h"
-
 void fatal (const char *string,...) ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 2);
 char *paddress (CORE_ADDR addr);
 char *pfildes (gdb_fildes_t fd);
diff --git a/gdb/utils.h b/gdb/utils.h
index 18a95a7..57a1c0f 100644
--- a/gdb/utils.h
+++ b/gdb/utils.h
@@ -23,7 +23,6 @@
 
 #include "cleanups.h"
 #include "exceptions.h"
-#include "print-utils.h"
 
 extern void initialize_utils (void);
 
-- 
1.7.1

Re: [PATCH 3/5 v7] Move print-utils.h to common-defs.h

[Doug Evans]

On Wed, Aug 13, 2014 at 2:56 AM, Gary Benson <gbenson@redhat.com> wrote:
> This commit moves the inclusion of print-utils.h to common-defs.h
> and removes all other inclusions.
>
> gdb/
> 2014-08-13  Gary Benson  <gbenson@redhat.com>
>
>         * common/common-defs.h: Include print-utils.h.
>         * utils.h: Do not include print-utils.h.
>
> gdb/gdbserver/
> 2014-08-13  Gary Benson  <gbenson@redhat.com>
>
>         * utils.h: Do not include print-utils.h.

I'm kinda ambivalent on this one, but ok.

[PATCH 4/5 v7] Introduce common-debug.h

[Gary Benson]

This introduces common-debug.h.  This holds the functions debug_printf
and debug_vprintf, two functions that the common code can use to print
debugging messages.  Clients of the common code are expected to
implement debug_vprintf; a debug_vprintf function is written from
scratch for GDB, and gdbserver's existing debug_printf is repurposed
as debug_vprintf.

common/agent.c is changed to use debug_vprintf rather than
defining the macro DEBUG_AGENT depending on GDBSERVER.

nat/i386-dregs.c is changed to use the externally-implemented
debug_printf, rather than defining it itself.

gdb/
2014-08-13  Tom Tromey  <tromey@redhat.com>
	    Gary Benson  <gbenson@redhat.com>

	* common/common-debug.h: New file.
	* common/common-debug.c: Likewise.
	* debug.c: Likewise.
	* Makefile.in (SFILES): Add common/common-debug.c.
	(HFILES_NO_SRCDIR): Add common/common-debug.h.
	(COMMON_OBS): Add common-debug.o and debug.o.
	(common-debug.o): New rule.
	* common/common-defs.h: Include common-debug.h.
	* common/agent.c (debug_agent_printf): New function.
	(DEBUG_AGENT): Redefine.
	* nat/i386-dregs.c (debug_printf): Undefine.

gdb/gdbserver/
2014-08-13  Tom Tromey  <tromey@redhat.com>
	    Gary Benson  <gbenson@redhat.com>

	* Makefile.in (SFILES): Add common/common-debug.c.
	(OBS): Add common-debug.o.
	(common-debug.o): New rule.
	* debug.h (debug_printf): Don't declare.
	* debug.c (debug_printf): Renamed and rewritten as...
	(debug_vprintf): New function.
---
 gdb/ChangeLog             |   15 +++++++++++++++
 gdb/Makefile.in           |   11 ++++++++---
 gdb/common/agent.c        |   24 +++++++++++++++---------
 gdb/common/common-debug.c |   37 +++++++++++++++++++++++++++++++++++++
 gdb/common/common-debug.h |   36 ++++++++++++++++++++++++++++++++++++
 gdb/common/common-defs.h  |    1 +
 gdb/debug.c               |   28 ++++++++++++++++++++++++++++
 gdb/gdbserver/ChangeLog   |   10 ++++++++++
 gdb/gdbserver/Makefile.in |   10 +++++++---
 gdb/gdbserver/debug.c     |   11 ++++-------
 gdb/gdbserver/debug.h     |    1 -
 gdb/nat/i386-dregs.c      |    4 ----
 12 files changed, 161 insertions(+), 27 deletions(-)
 create mode 100644 gdb/common/common-debug.c
 create mode 100644 gdb/common/common-debug.h
 create mode 100644 gdb/debug.c

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 76ca0da..b33defe 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -851,7 +851,7 @@ SFILES = ada-exp.y ada-lang.c ada-typeprint.c ada-valprint.c ada-tasks.c \
 	common/ptid.c common/buffer.c gdb-dlfcn.c common/agent.c \
 	common/format.c common/filestuff.c btrace.c record-btrace.c ctf.c \
 	target/waitstatus.c common/print-utils.c common/rsp-low.c \
-	common/errors.c
+	common/errors.c common/common-debug.c
 
 LINTFILES = $(SFILES) $(YYFILES) $(CONFIG_SRCS) init.c
 
@@ -936,7 +936,8 @@ gdb_bfd.h sparc-ravenscar-thread.h ppc-ravenscar-thread.h nat/linux-btrace.h \
 ctf.h nat/i386-cpuid.h nat/i386-gcc-cpuid.h target/resume.h \
 target/wait.h target/waitstatus.h nat/linux-nat.h nat/linux-waitpid.h \
 common/print-utils.h common/rsp-low.h nat/i386-dregs.h x86-linux-nat.h \
-i386-linux-nat.h common/common-defs.h common/errors.h common/common-types.h
+i386-linux-nat.h common/common-defs.h common/errors.h common/common-types.h \
+common/common-debug.h
 
 # Header files that already have srcdir in them, or which are in objdir.
 
@@ -1035,7 +1036,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
 	gdb_vecs.o jit.o progspace.o skip.o probe.o \
 	common-utils.o buffer.o ptid.o gdb-dlfcn.o common-agent.o \
 	format.o registry.o btrace.o record-btrace.o waitstatus.o \
-	print-utils.o rsp-low.o errors.o
+	print-utils.o rsp-low.o errors.o common-debug.o debug.o
 
 TSOBS = inflow.o
 
@@ -2149,6 +2150,10 @@ errors.o: ${srcdir}/common/errors.c
 	$(COMPILE) $(srcdir)/common/errors.c
 	$(POSTCOMPILE)
 
+common-debug.o: ${srcdir}/common/common-debug.c
+	$(COMPILE) $(srcdir)/common/common-debug.c
+	$(POSTCOMPILE)
+
 #
 # gdb/target/ dependencies
 #
diff --git a/gdb/common/agent.c b/gdb/common/agent.c
index 3f868ba..2963917 100644
--- a/gdb/common/agent.c
+++ b/gdb/common/agent.c
@@ -31,15 +31,21 @@
 
 int debug_agent = 0;
 
-#ifdef GDBSERVER
-#define DEBUG_AGENT(fmt, args...)	\
-  if (debug_agent)			\
-    fprintf (stderr, fmt, ##args);
-#else
-#define DEBUG_AGENT(fmt, args...)	\
-  if (debug_agent)			\
-    fprintf_unfiltered (gdb_stdlog, fmt, ##args);
-#endif
+/* A stdarg wrapper for debug_vprintf.  */
+
+static void ATTRIBUTE_PRINTF (1, 2)
+debug_agent_printf (const char *fmt, ...)
+{
+  va_list ap;
+
+  if (!debug_agent)
+    return;
+  va_start (ap, fmt);
+  debug_vprintf (fmt, ap);
+  va_end (ap);
+}
+
+#define DEBUG_AGENT debug_agent_printf
 
 /* Global flag to determine using agent or not.  */
 int use_agent = 0;
diff --git a/gdb/common/common-debug.c b/gdb/common/common-debug.c
new file mode 100644
index 0000000..660fc70
--- /dev/null
+++ b/gdb/common/common-debug.c
@@ -0,0 +1,37 @@
+/* Debug printing functions.
+
+   Copyright (C) 2014 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/>.  */
+
+#ifdef GDBSERVER
+#include "server.h"
+#else
+#include "defs.h"
+#endif
+#include "common-debug.h"
+
+/* See common/common-debug.h.  */
+
+void
+debug_printf (const char *fmt, ...)
+{
+  va_list ap;
+
+  va_start (ap, fmt);
+  debug_vprintf (fmt, ap);
+  va_end (ap);
+}
diff --git a/gdb/common/common-debug.h b/gdb/common/common-debug.h
new file mode 100644
index 0000000..c2bb192
--- /dev/null
+++ b/gdb/common/common-debug.h
@@ -0,0 +1,36 @@
+/* Declarations for debug printing functions.
+
+   Copyright (C) 2014 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 COMMON_DEBUG_H
+#define COMMON_DEBUG_H
+
+/* Print a formatted message to the appropriate channel for
+   debugging output for the client.  */
+
+extern void debug_printf (const char *format, ...)
+     ATTRIBUTE_PRINTF (1, 2);
+
+/* Print a formatted message to the appropriate channel for
+   debugging output for the client.  This function must be
+   provided by the client.  */
+
+extern void debug_vprintf (const char *format, va_list ap)
+     ATTRIBUTE_PRINTF (1, 0);
+
+#endif /* COMMON_DEBUG_H */
diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h
index 66c0d21..2d3444b 100644
--- a/gdb/common/common-defs.h
+++ b/gdb/common/common-defs.h
@@ -44,5 +44,6 @@
 #include "errors.h"
 #include "common-types.h"
 #include "print-utils.h"
+#include "common-debug.h"
 
 #endif /* COMMON_DEFS_H */
diff --git a/gdb/debug.c b/gdb/debug.c
new file mode 100644
index 0000000..95cf617
--- /dev/null
+++ b/gdb/debug.c
@@ -0,0 +1,28 @@
+/* Debug printing functions.
+
+   Copyright (C) 2014 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"
+
+/* See common/common-debug.h.  */
+
+void
+debug_vprintf (const char *fmt, va_list ap)
+{
+  vfprintf_unfiltered (gdb_stdlog, fmt, ap);
+}
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 1faa00c..18486c6 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -169,7 +169,8 @@ SFILES=	$(srcdir)/gdbreplay.c $(srcdir)/inferiors.c $(srcdir)/dll.c \
 	$(srcdir)/common/buffer.c $(srcdir)/nat/linux-btrace.c \
 	$(srcdir)/common/filestuff.c $(srcdir)/target/waitstatus.c \
 	$(srcdir)/nat/mips-linux-watch.c $(srcdir)/common/print-utils.c \
-	$(srcdir)/common/rsp-low.c $(srcdir)/common/errors.c
+	$(srcdir)/common/rsp-low.c $(srcdir)/common/errors.c \
+	$(srcdir)/common/common-debug.c
 
 DEPFILES = @GDBSERVER_DEPFILES@
 
@@ -182,8 +183,8 @@ OBS = agent.o ax.o inferiors.o regcache.o remote-utils.o server.o signals.o \
       target.o waitstatus.o utils.o debug.o version.o vec.o gdb_vecs.o \
       mem-break.o hostio.o event-loop.o tracepoint.o xml-utils.o \
       common-utils.o ptid.o buffer.o format.o filestuff.o dll.o notif.o \
-      tdesc.o print-utils.o rsp-low.o errors.o $(XML_BUILTIN) $(DEPFILES) \
-      $(LIBOBJS)
+      tdesc.o print-utils.o rsp-low.o errors.o common-debug.o \
+      $(XML_BUILTIN) $(DEPFILES) $(LIBOBJS)
 GDBREPLAY_OBS = gdbreplay.o version.o
 GDBSERVER_LIBS = @GDBSERVER_LIBS@
 XM_CLIBS = @LIBS@
@@ -540,6 +541,9 @@ agent.o: ../common/agent.c
 errors.o: ../common/errors.c
 	$(COMPILE) $<
 	$(POSTCOMPILE)
+common-debug.o: ../common/common-debug.c
+	$(COMPILE) $<
+	$(POSTCOMPILE)
 waitstatus.o: ../target/waitstatus.c
 	$(COMPILE) $<
 	$(POSTCOMPILE)
diff --git a/gdb/gdbserver/debug.c b/gdb/gdbserver/debug.c
index c50af76..339e33c 100644
--- a/gdb/gdbserver/debug.c
+++ b/gdb/gdbserver/debug.c
@@ -33,9 +33,8 @@ int debug_timestamp;
    previous call ended with "\n".  */
 
 void
-debug_printf (const char *msg, ...)
+debug_vprintf (const char *format, va_list ap)
 {
-  va_list args;
 #if !defined (IN_PROCESS_AGENT)
   /* N.B. Not thread safe, and can't be used, as is, with IPA.  */
   static int new_line = 1;
@@ -53,13 +52,11 @@ debug_printf (const char *msg, ...)
     }
 #endif
 
-  va_start (args, msg);
-  vfprintf (stderr, msg, args);
-  va_end (args);
+  vfprintf (stderr, format, ap);
 
 #if !defined (IN_PROCESS_AGENT)
-  if (*msg)
-    new_line = msg[strlen (msg) - 1] == '\n';
+  if (*format)
+    new_line = format[strlen (format) - 1] == '\n';
 #endif
 }
 
diff --git a/gdb/gdbserver/debug.h b/gdb/gdbserver/debug.h
index 0f056ca..42a3f21 100644
--- a/gdb/gdbserver/debug.h
+++ b/gdb/gdbserver/debug.h
@@ -29,7 +29,6 @@
 extern int debug_threads;
 extern int debug_timestamp;
 
-void debug_printf (const char *msg, ...) ATTRIBUTE_PRINTF (1, 2);
 void debug_flush (void);
 void do_debug_enter (const char *function_name);
 void do_debug_exit (const char *function_name);
diff --git a/gdb/nat/i386-dregs.c b/gdb/nat/i386-dregs.c
index 1fa5c19..e3272cd 100644
--- a/gdb/nat/i386-dregs.c
+++ b/gdb/nat/i386-dregs.c
@@ -178,10 +178,6 @@ typedef enum { WP_INSERT, WP_REMOVE, WP_COUNT } i386_wp_op_t;
 #ifndef GDBSERVER
 /* Whether or not to print the mirrored debug registers.  */
 extern int debug_hw_points;
-
-/* Print debugging messages.  */
-#define debug_printf(fmt, args...) \
-  fprintf_unfiltered (gdb_stdlog, fmt, ##args);
 #endif
 
 /* Print the values of the mirrored debug registers.  */
-- 
1.7.1

Re: [PATCH 4/5 v7] Introduce common-debug.h

[Doug Evans]

On Wed, Aug 13, 2014 at 2:56 AM, Gary Benson <gbenson@redhat.com> wrote:
> This introduces common-debug.h.  This holds the functions debug_printf
> and debug_vprintf, two functions that the common code can use to print
> debugging messages.  Clients of the common code are expected to
> implement debug_vprintf; a debug_vprintf function is written from
> scratch for GDB, and gdbserver's existing debug_printf is repurposed
> as debug_vprintf.
>
> common/agent.c is changed to use debug_vprintf rather than
> defining the macro DEBUG_AGENT depending on GDBSERVER.
>
> nat/i386-dregs.c is changed to use the externally-implemented
> debug_printf, rather than defining it itself.
>
> gdb/
> 2014-08-13  Tom Tromey  <tromey@redhat.com>
>             Gary Benson  <gbenson@redhat.com>
>
>         * common/common-debug.h: New file.
>         * common/common-debug.c: Likewise.
>         * debug.c: Likewise.
>         * Makefile.in (SFILES): Add common/common-debug.c.
>         (HFILES_NO_SRCDIR): Add common/common-debug.h.
>         (COMMON_OBS): Add common-debug.o and debug.o.
>         (common-debug.o): New rule.
>         * common/common-defs.h: Include common-debug.h.
>         * common/agent.c (debug_agent_printf): New function.
>         (DEBUG_AGENT): Redefine.
>         * nat/i386-dregs.c (debug_printf): Undefine.
>
> gdb/gdbserver/
> 2014-08-13  Tom Tromey  <tromey@redhat.com>
>             Gary Benson  <gbenson@redhat.com>
>
>         * Makefile.in (SFILES): Add common/common-debug.c.
>         (OBS): Add common-debug.o.
>         (common-debug.o): New rule.
>         * debug.h (debug_printf): Don't declare.
>         * debug.c (debug_printf): Renamed and rewritten as...
>         (debug_vprintf): New function.

LGTM

Re: [PATCH 4/5 v7] Introduce common-debug.h

[Gary Benson]

Doug Evans wrote:
> On Wed, Aug 13, 2014 at 2:56 AM, Gary Benson <gbenson@redhat.com> wrote:
> > This introduces common-debug.h.  This holds the functions
> > debug_printf and debug_vprintf, two functions that the common
> > code can use to print debugging messages.  Clients of the common
> > code are expected to implement debug_vprintf; a debug_vprintf
> > function is written from scratch for GDB, and gdbserver's
> > existing debug_printf is repurposed as debug_vprintf.
> >
> > common/agent.c is changed to use debug_vprintf rather than
> > defining the macro DEBUG_AGENT depending on GDBSERVER.
> >
> > nat/i386-dregs.c is changed to use the externally-implemented
> > debug_printf, rather than defining it itself.
> >
> > gdb/
> > 2014-08-13  Tom Tromey  <tromey@redhat.com>
> >             Gary Benson  <gbenson@redhat.com>
> >
> >         * common/common-debug.h: New file.
> >         * common/common-debug.c: Likewise.
> >         * debug.c: Likewise.
> >         * Makefile.in (SFILES): Add common/common-debug.c.
> >         (HFILES_NO_SRCDIR): Add common/common-debug.h.
> >         (COMMON_OBS): Add common-debug.o and debug.o.
> >         (common-debug.o): New rule.
> >         * common/common-defs.h: Include common-debug.h.
> >         * common/agent.c (debug_agent_printf): New function.
> >         (DEBUG_AGENT): Redefine.
> >         * nat/i386-dregs.c (debug_printf): Undefine.
> >
> > gdb/gdbserver/
> > 2014-08-13  Tom Tromey  <tromey@redhat.com>
> >             Gary Benson  <gbenson@redhat.com>
> >
> >         * Makefile.in (SFILES): Add common/common-debug.c.
> >         (OBS): Add common-debug.o.
> >         (common-debug.o): New rule.
> >         * debug.h (debug_printf): Don't declare.
> >         * debug.c (debug_printf): Renamed and rewritten as...
> >         (debug_vprintf): New function.
> 
> LGTM

I've pushed this series up to here.  Thanks for reviewing this Doug.

Cheers,
Gary

-- 
http://gbenson.net/

Re: [PATCH 4/5 v7] Introduce common-debug.h

[Steve Ellcey]

On Tue, 2014-08-19 at 10:12 +0100, Gary Benson wrote:

> > > 2014-08-13  Tom Tromey  <tromey@redhat.com>
> > >             Gary Benson  <gbenson@redhat.com>
> > >
> > >         * common/common-debug.h: New file.
> > >         * common/common-debug.c: Likewise.
> > >         * debug.c: Likewise.
> > >         * Makefile.in (SFILES): Add common/common-debug.c.
> > >         (HFILES_NO_SRCDIR): Add common/common-debug.h.
> > >         (COMMON_OBS): Add common-debug.o and debug.o.
> > >         (common-debug.o): New rule.
> > >         * common/common-defs.h: Include common-debug.h.
> > >         * common/agent.c (debug_agent_printf): New function.
> > >         (DEBUG_AGENT): Redefine.
> > >         * nat/i386-dregs.c (debug_printf): Undefine.

I just built gdb for mips (mips-linux-gnu and mips-mti-linux-gnu) and it
died with:

/local/home/sellcey/gcc/non_mti_linux/src/binutils-gdb/sim/mips/../common/sim-trace.c:1326: multiple definition of `debug_printf'
common-debug.o:/local/home/sellcey/gcc/non_mti_linux/src/binutils-gdb/gdb/common/common-debug.c:31: first defined here
collect2: ld returned 1 exit status
make[1]: *** [gdb] Error 1

I am assuming it has something to do with this patch.

Steve Ellcey
sellcey@mips.com

Re: [PATCH 4/5 v7] Introduce common-debug.h

[Gary Benson]

[Cc'ing Mike and Frank (SIM global maintainer and SIM common
maintainer)]

Steve Ellcey wrote:
> On Tue, 2014-08-19 at 10:12 +0100, Gary Benson wrote:
> > > > 2014-08-13  Tom Tromey  <tromey@redhat.com>
> > > >             Gary Benson  <gbenson@redhat.com>
> > > >
> > > >         * common/common-debug.h: New file.
> > > >         * common/common-debug.c: Likewise.
> > > >         * debug.c: Likewise.
> > > >         * Makefile.in (SFILES): Add common/common-debug.c.
> > > >         (HFILES_NO_SRCDIR): Add common/common-debug.h.
> > > >         (COMMON_OBS): Add common-debug.o and debug.o.
> > > >         (common-debug.o): New rule.
> > > >         * common/common-defs.h: Include common-debug.h.
> > > >         * common/agent.c (debug_agent_printf): New function.
> > > >         (DEBUG_AGENT): Redefine.
> > > >         * nat/i386-dregs.c (debug_printf): Undefine.
> 
> I just built gdb for mips (mips-linux-gnu and mips-mti-linux-gnu)
> and it died with:
> 
> /local/home/sellcey/gcc/non_mti_linux/src/binutils-gdb/sim/mips/../common/sim-trace.c:1326: multiple definition of `debug_printf'
> common-debug.o:/local/home/sellcey/gcc/non_mti_linux/src/binutils-gdb/gdb/common/common-debug.c:31: first defined here
> collect2: ld returned 1 exit status
> make[1]: *** [gdb] Error 1
> 
> I am assuming it has something to do with this patch.

Yeah.  This patch adds a "debug_printf" function to GDB, but it looks
like SIM already had one.

I don't see any callers for SIM's debug_printf.  Is this dead code
that can be removed, or is it provided as a convenience/library
function?

Steve, you can probably work around this for now by adding:

  #define debug_printf gdb_debug_printf

at the top of GDB's common/common-debug.h.  If SIM's debug_printf
cannot be removed then maybe we will have to add some hack like
this to GDB permanently.

Thanks,
Gary

-- 
http://gbenson.net/

Re: [PATCH 4/5 v7] Introduce common-debug.h

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 2316 bytes --]

On Wed 20 Aug 2014 09:52:43 Gary Benson wrote:
> [Cc'ing Mike and Frank (SIM global maintainer and SIM common
> maintainer)]
> 
> Steve Ellcey wrote:
> > On Tue, 2014-08-19 at 10:12 +0100, Gary Benson wrote:
> > > > > 2014-08-13  Tom Tromey  <tromey@redhat.com>
> > > > > 
> > > > >             Gary Benson  <gbenson@redhat.com>
> > > > >         
> > > > >         * common/common-debug.h: New file.
> > > > >         * common/common-debug.c: Likewise.
> > > > >         * debug.c: Likewise.
> > > > >         * Makefile.in (SFILES): Add common/common-debug.c.
> > > > >         (HFILES_NO_SRCDIR): Add common/common-debug.h.
> > > > >         (COMMON_OBS): Add common-debug.o and debug.o.
> > > > >         (common-debug.o): New rule.
> > > > >         * common/common-defs.h: Include common-debug.h.
> > > > >         * common/agent.c (debug_agent_printf): New function.
> > > > >         (DEBUG_AGENT): Redefine.
> > > > >         * nat/i386-dregs.c (debug_printf): Undefine.
> > 
> > I just built gdb for mips (mips-linux-gnu and mips-mti-linux-gnu)
> > and it died with:
> > 
> > /local/home/sellcey/gcc/non_mti_linux/src/binutils-gdb/sim/mips/../common/
> > sim-trace.c:1326: multiple definition of `debug_printf'
> > common-debug.o:/local/home/sellcey/gcc/non_mti_linux/src/binutils-gdb/gdb
> > /common/common-debug.c:31: first defined here collect2: ld returned 1 exit
> > status
> > make[1]: *** [gdb] Error 1
> > 
> > I am assuming it has something to do with this patch.
> 
> Yeah.  This patch adds a "debug_printf" function to GDB, but it looks
> like SIM already had one.
> 
> I don't see any callers for SIM's debug_printf.  Is this dead code
> that can be removed, or is it provided as a convenience/library
> function?

it is not currently being used, but it really really should be in some targets

> Steve, you can probably work around this for now by adding:
> 
>   #define debug_printf gdb_debug_printf
> 
> at the top of GDB's common/common-debug.h.  If SIM's debug_printf
> cannot be removed then maybe we will have to add some hack like
> this to GDB permanently.

i'm fine with updating sim/common/sim-trace.h with that idea:
#define debug_printf sim_debug_printf

all the symbols coming out of the sim really should be namespaced
-mike

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 4/5 v7] Introduce common-debug.h

[Gary Benson]

Mike Frysinger wrote:
> On Wed 20 Aug 2014 09:52:43 Gary Benson wrote:
> > I don't see any callers for SIM's debug_printf.  Is this dead code
> > that can be removed, or is it provided as a convenience/library
> > function?
> 
> it is not currently being used, but it really really should be in
> some targets

Ok.

> > Steve, you can probably work around this for now by adding:
> > 
> >   #define debug_printf gdb_debug_printf
> > 
> > at the top of GDB's common/common-debug.h.  If SIM's debug_printf
> > cannot be removed then maybe we will have to add some hack like
> > this to GDB permanently.
> 
> i'm fine with updating sim/common/sim-trace.h with that idea:
> #define debug_printf sim_debug_printf
> 
> all the symbols coming out of the sim really should be namespaced

Great.  I can put together a patch if you like (or I can make the
change, or you can... whatever's easiest!)  I don't know much about
SIM... is there a list to mail patches to?  And, is its upstream
repo the same as binutils+GDB or is it imported from somewhere else
like libiberty?

Cheers,
Gary

-- 
http://gbenson.net/

Re: [PATCH 4/5 v7] Introduce common-debug.h

[Frank Ch. Eigler]

Hi -


> > [...]
> > i'm fine with updating sim/common/sim-trace.h with that idea:
> > #define debug_printf sim_debug_printf
> > all the symbols coming out of the sim really should be namespaced

IMHO, names this generic should be avoided in *both* application (gdb)
and library (sim), lest another future library come & interfere later.


> Great.  I can put together a patch if you like (or I can make the
> change, or you can... whatever's easiest!)  I don't know much about
> SIM... is there a list to mail patches to?  And, is its upstream
> repo the same as binutils+GDB or is it imported from somewhere else
> like libiberty?

sim is part of the binutils-gdb.git repo, patches here fine.  The main
problem with testing the sim for changes like this is its inability to
easily build all targets, and its aggressive use of macros, which
makes it hard to know you've actually covered all the cases for a
symbol-rename.

- FChE

Re: [PATCH 4/5 v7] Introduce common-debug.h

[Gary Benson]

Frank Ch. Eigler wrote:
> > > [...]
> > > i'm fine with updating sim/common/sim-trace.h with that idea:
> > > #define debug_printf sim_debug_printf
> > > all the symbols coming out of the sim really should be namespaced
> 
> IMHO, names this generic should be avoided in *both* application (gdb)
> and library (sim), lest another future library come & interfere later.

Yeah, I should know this by now :/

> > Great.  I can put together a patch if you like (or I can make the
> > change, or you can... whatever's easiest!)  I don't know much about
> > SIM... is there a list to mail patches to?  And, is its upstream
> > repo the same as binutils+GDB or is it imported from somewhere else
> > like libiberty?
> 
> sim is part of the binutils-gdb.git repo, patches here fine.  The
> main problem with testing the sim for changes like this is its
> inability to easily build all targets, and its aggressive use of
> macros, which makes it hard to know you've actually covered all the
> cases for a symbol-rename.

Yuck :(

Frank, if you're not ok with the patch I just mailed then let me know
and I'll figure something out when I get back from PTO.

Thanks,
Gary

-- 
http://gbenson.net/

Re: [PATCH 4/5 v7] Introduce common-debug.h

[Frank Ch. Eigler]

Hi -

On Wed, Aug 20, 2014 at 08:16:19PM +0100, Gary Benson wrote:
> [...]
> Frank, if you're not ok with the patch I just mailed then let me know
> and I'll figure something out when I get back from PTO.

(I have no objection to the #define in gdb/*.)

- FChE

Re: [PATCH 4/5 v7] Introduce common-debug.h

[Doug Evans]

On Wed, Aug 20, 2014 at 2:40 PM, Frank Ch. Eigler <fche@redhat.com> wrote:
> Hi -
>
> On Wed, Aug 20, 2014 at 08:16:19PM +0100, Gary Benson wrote:
>> [...]
>> Frank, if you're not ok with the patch I just mailed then let me know
>> and I'll figure something out when I get back from PTO.
>
> (I have no objection to the #define in gdb/*.)

Of course you don't. :-)
[that smiley is a sincere smiley, not a sarcastic one!]
[and I'm assuming that's not a typo, and you didn't mean to say sim/*]

How much effort is involved in renaming sim's debug_printf?

Re: [PATCH 4/5 v7] Introduce common-debug.h

[Gary Benson]

Frank Ch. Eigler wrote:
> On Wed, Aug 20, 2014 at 08:16:19PM +0100, Gary Benson wrote:
> > [...]
> > Frank, if you're not ok with the patch I just mailed then let me know
> > and I'll figure something out when I get back from PTO.
> 
> (I have no objection to the #define in gdb/*.)

I take this to mean you do object to a #define in sim/*.
Ok, I'll submit a GDB patch when I get back.

Thanks,
Gary

--
http://gbenson.net/

Re: [PATCH 4/5 v7] Introduce common-debug.h

[Frank Ch. Eigler]

Hi -

> > (I have no objection to the #define in gdb/*.)
> I take this to mean you do object to a #define in sim/*.

No - just that a gdb/* patch the only one I think I saw.  Making an
analogue for sim/* would be fine, but testing it for wide buildability
will be a hassle.

- FChE

Re: [PATCH 4/5 v7] Introduce common-debug.h

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 492 bytes --]

On Wed 20 Aug 2014 18:47:41 Frank Ch. Eigler wrote:
> > > (I have no objection to the #define in gdb/*.)
> > 
> > I take this to mean you do object to a #define in sim/*.
> 
> No - just that a gdb/* patch the only one I think I saw.  Making an
> analogue for sim/* would be fine, but testing it for wide buildability
> will be a hassle.

i wouldn't worry too much about that ... i have local builds for most every 
target, and i think some others notice when things break too
-mike

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PING PATCH] Rename SIM's debug_printf (Was: [PATCH 4/5 v7] Introduce common-debug.h)

[Gary Benson]

Mike Frysinger wrote:
> On Wed 20 Aug 2014 18:47:41 Frank Ch. Eigler wrote:
> > > > (I have no objection to the #define in gdb/*.)
> > > 
> > > I take this to mean you do object to a #define in sim/*.
> > 
> > No - just that a gdb/* patch the only one I think I saw.  Making
> > an analogue for sim/* would be fine, but testing it for wide
> > buildability will be a hassle.
> 
> i wouldn't worry too much about that ... i have local builds for
> most every target, and i think some others notice when things break
> too

Frank, are you ok with the patch in sim/* with Mike's assurances?
I inlined the patch under discussion below, for avoidance of doubt.

Thanks,
Gary

-- 
2014-08-20  Gary Benson  <gbenson@redhat.com>

	* sim-trace.h (debug_printf): New define.

diff --git a/sim/common/sim-trace.h b/sim/common/sim-trace.h
index 5fb58e1..69fffb4 100644
--- a/sim/common/sim-trace.h
+++ b/sim/common/sim-trace.h
@@ -583,6 +583,9 @@ extern void trace_vprintf (SIM_DESC, sim_cpu *, const char *, va_list);
 /* Non-zero if "--debug-insn" specified.  */
 #define DEBUG_INSN_P(cpu) DEBUG_P (cpu, DEBUG_INSN_IDX)
 
+/* GDB also has a debug_printf, so we shadow ours.  */
+#define debug_printf sim_debug_printf
+
 extern void debug_printf (sim_cpu *, const char *, ...)
      __attribute__((format (printf, 2, 3)));
 

Re: [PING PATCH] Rename SIM's debug_printf (Was: [PATCH 4/5 v7] Introduce common-debug.h)

[Frank Ch. Eigler]

Hi -

> Frank, are you ok with the patch in sim/* with Mike's assurances?
> I inlined the patch under discussion below, for avoidance of doubt.

Sure.


- FChE

Re: [PING PATCH] Rename SIM's debug_printf (Was: [PATCH 4/5 v7] Introduce common-debug.h)

[Gary Benson]

Frank Ch. Eigler wrote:
> > Frank, are you ok with the patch in sim/* with Mike's assurances?
> > I inlined the patch under discussion below, for avoidance of doubt.
> 
> Sure.

Ok, I've pushed this.

Thanks,
Gary

-- 
http://gbenson.net/

Re: [PATCH 4/5 v7] Introduce common-debug.h

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 1080 bytes --]

On Wed 20 Aug 2014 13:09:34 Gary Benson wrote:
> Mike Frysinger wrote:
> > On Wed 20 Aug 2014 09:52:43 Gary Benson wrote:
> > > Steve, you can probably work around this for now by adding:
> > >   #define debug_printf gdb_debug_printf
> > > 
> > > at the top of GDB's common/common-debug.h.  If SIM's debug_printf
> > > cannot be removed then maybe we will have to add some hack like
> > > this to GDB permanently.
> > 
> > i'm fine with updating sim/common/sim-trace.h with that idea:
> > #define debug_printf sim_debug_printf
> > 
> > all the symbols coming out of the sim really should be namespaced
> 
> Great.  I can put together a patch if you like (or I can make the
> change, or you can... whatever's easiest!)  I don't know much about
> SIM... is there a list to mail patches to?  And, is its upstream
> repo the same as binutils+GDB or is it imported from somewhere else
> like libiberty?

it would be great if you could put together the patch :).  sim patches go to 
the same place as gdb (same repo), and i can approve them when i see them.
-mike

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 4/5 v7] Introduce common-debug.h

[Gary Benson]

Mike Frysinger wrote:
> On Wed 20 Aug 2014 13:09:34 Gary Benson wrote:
> > Mike Frysinger wrote:
> > > On Wed 20 Aug 2014 09:52:43 Gary Benson wrote:
> > > > Steve, you can probably work around this for now by adding:
> > > >   #define debug_printf gdb_debug_printf
> > > > 
> > > > at the top of GDB's common/common-debug.h.  If SIM's debug_printf
> > > > cannot be removed then maybe we will have to add some hack like
> > > > this to GDB permanently.
> > > 
> > > i'm fine with updating sim/common/sim-trace.h with that idea:
> > > #define debug_printf sim_debug_printf
> > > 
> > > all the symbols coming out of the sim really should be namespaced
> > 
> > Great.  I can put together a patch if you like (or I can make the
> > change, or you can... whatever's easiest!)  I don't know much about
> > SIM... is there a list to mail patches to?  And, is its upstream
> > repo the same as binutils+GDB or is it imported from somewhere else
> > like libiberty?
> 
> it would be great if you could put together the patch :).  sim
> patches go to the same place as gdb (same repo), and i can approve
> them when i see them.

Inlined below.  I'm away til Tuesday now, but I'll try and check my
email before I go so if I see you and Frank are happy with this then
I'll commit it.  If I don't, feel free to commit it yourself or wait
(I'm happy with either).

Thanks,
Gary

-- 
2014-08-20  Gary Benson  <gbenson@redhat.com>

	* sim-trace.h (debug_printf): New define.

diff --git a/sim/common/sim-trace.h b/sim/common/sim-trace.h
index 5fb58e1..69fffb4 100644
--- a/sim/common/sim-trace.h
+++ b/sim/common/sim-trace.h
@@ -583,6 +583,9 @@ extern void trace_vprintf (SIM_DESC, sim_cpu *, const char *, va_list);
 /* Non-zero if "--debug-insn" specified.  */
 #define DEBUG_INSN_P(cpu) DEBUG_P (cpu, DEBUG_INSN_IDX)
 
+/* GDB also has a debug_printf, so we shadow ours.  */
+#define debug_printf sim_debug_printf
+
 extern void debug_printf (sim_cpu *, const char *, ...)
      __attribute__((format (printf, 2, 3)));
 

Re: [PATCH 4/5 v7] Introduce common-debug.h

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 1514 bytes --]

On Wed 20 Aug 2014 20:14:37 Gary Benson wrote:
> Mike Frysinger wrote:
> > On Wed 20 Aug 2014 13:09:34 Gary Benson wrote:
> > > Mike Frysinger wrote:
> > > > On Wed 20 Aug 2014 09:52:43 Gary Benson wrote:
> > > > > Steve, you can probably work around this for now by adding:
> > > > >   #define debug_printf gdb_debug_printf
> > > > > 
> > > > > at the top of GDB's common/common-debug.h.  If SIM's debug_printf
> > > > > cannot be removed then maybe we will have to add some hack like
> > > > > this to GDB permanently.
> > > > 
> > > > i'm fine with updating sim/common/sim-trace.h with that idea:
> > > > #define debug_printf sim_debug_printf
> > > > 
> > > > all the symbols coming out of the sim really should be namespaced
> > > 
> > > Great.  I can put together a patch if you like (or I can make the
> > > change, or you can... whatever's easiest!)  I don't know much about
> > > SIM... is there a list to mail patches to?  And, is its upstream
> > > repo the same as binutils+GDB or is it imported from somewhere else
> > > like libiberty?
> > 
> > it would be great if you could put together the patch :).  sim
> > patches go to the same place as gdb (same repo), and i can approve
> > them when i see them.
> 
> Inlined below.  I'm away til Tuesday now, but I'll try and check my
> email before I go so if I see you and Frank are happy with this then
> I'll commit it.  If I don't, feel free to commit it yourself or wait
> (I'm happy with either).

lgtm.  thanks!
-mike

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH 2/5 v7] Introduce common-types.h

[Gary Benson]

This introduces common-types.h.  This file defines various standard
types used by gdb and gdbserver.

Currently these types are conditionally defined based on GDBSERVER.
The long term goal is to remove all such tests; however, this is
difficult as currently gdb uses definitions from BFD.  In the meantime
this is still a step in the right direction.

gdb/
2014-08-13  Tom Tromey  <tromey@redhat.com>
	    Gary Benson  <gbenson@redhat.com>

	* common/common-types.h: New file.
	* Makefile.in (HFILES_NO_SRCDIR): Add common/common-types.h.
	* common/common-defs.h: Include common-types.h.
	* defs.h (gdb_byte, CORE_ADDR, CORE_ADDR_MAX, LONGEST)
	(ULONGEST): Remove.

gdb/gdbserver/
2014-08-13  Tom Tromey  <tromey@redhat.com>
	    Gary Benson  <gbenson@redhat.com>

	* server.h: Add static assertion.
	(gdb_byte, CORE_ADDR, LONGEST, ULONGEST): Remove.
---
 gdb/ChangeLog             |    9 ++++++
 gdb/Makefile.in           |    2 +-
 gdb/common/common-defs.h  |    1 +
 gdb/common/common-types.h |   61 +++++++++++++++++++++++++++++++++++++++++++++
 gdb/defs.h                |   29 ---------------------
 gdb/gdbserver/ChangeLog   |    6 ++++
 gdb/gdbserver/server.h    |   13 +--------
 7 files changed, 80 insertions(+), 41 deletions(-)
 create mode 100644 gdb/common/common-types.h

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index fa0dcd4..76ca0da 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -936,7 +936,7 @@ gdb_bfd.h sparc-ravenscar-thread.h ppc-ravenscar-thread.h nat/linux-btrace.h \
 ctf.h nat/i386-cpuid.h nat/i386-gcc-cpuid.h target/resume.h \
 target/wait.h target/waitstatus.h nat/linux-nat.h nat/linux-waitpid.h \
 common/print-utils.h common/rsp-low.h nat/i386-dregs.h x86-linux-nat.h \
-i386-linux-nat.h common/common-defs.h common/errors.h
+i386-linux-nat.h common/common-defs.h common/errors.h common/common-types.h
 
 # Header files that already have srcdir in them, or which are in objdir.
 
diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h
index a15423c..5543e4c 100644
--- a/gdb/common/common-defs.h
+++ b/gdb/common/common-defs.h
@@ -42,5 +42,6 @@
 #include "common-utils.h"
 #include "gdb_assert.h"
 #include "errors.h"
+#include "common-types.h"
 
 #endif /* COMMON_DEFS_H */
diff --git a/gdb/common/common-types.h b/gdb/common/common-types.h
new file mode 100644
index 0000000..9fa1c24
--- /dev/null
+++ b/gdb/common/common-types.h
@@ -0,0 +1,61 @@
+/* Declarations for common types.
+
+   Copyright (C) 1986-2014 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 COMMON_TYPES_H
+#define COMMON_TYPES_H
+
+#ifdef GDBSERVER
+
+/* * A byte from the program being debugged.  */
+typedef unsigned char gdb_byte;
+
+typedef unsigned long long CORE_ADDR;
+
+typedef long long LONGEST;
+typedef unsigned long long ULONGEST;
+
+#else /* GDBSERVER */
+
+#include "bfd.h"
+
+/* * A byte from the program being debugged.  */
+typedef bfd_byte gdb_byte;
+
+/* * An address in the program being debugged.  Host byte order.  */
+typedef bfd_vma CORE_ADDR;
+
+/* This is to make sure that LONGEST is at least as big as CORE_ADDR.  */
+
+#ifdef BFD64
+
+typedef BFD_HOST_64_BIT LONGEST;
+typedef BFD_HOST_U_64_BIT ULONGEST;
+
+#else /* No BFD64 */
+
+typedef long long LONGEST;
+typedef unsigned long long ULONGEST;
+
+#endif /* No BFD64 */
+#endif /* GDBSERVER */
+
+/* * The largest CORE_ADDR value.  */
+#define CORE_ADDR_MAX (~ (CORE_ADDR) 0)
+
+#endif /* COMMON_TYPES_H */
diff --git a/gdb/defs.h b/gdb/defs.h
index b7271a7..8914512 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -76,35 +76,6 @@
 
 #include "hashtab.h"
 
-/* Rather than duplicate all the logic in BFD for figuring out what
-   types to use (which can be pretty complicated), symply define them
-   in terms of the corresponding type from BFD.  */
-
-#include "bfd.h"
-
-/* * A byte from the program being debugged.  */
-typedef bfd_byte gdb_byte;
-
-/* * An address in the program being debugged.  Host byte order.  */
-typedef bfd_vma CORE_ADDR;
-
-/* * The largest CORE_ADDR value.  */
-#define CORE_ADDR_MAX (~ (CORE_ADDR) 0)
-
-/* This is to make sure that LONGEST is at least as big as CORE_ADDR.  */
-
-#ifdef BFD64
-
-#define LONGEST BFD_HOST_64_BIT
-#define ULONGEST BFD_HOST_U_64_BIT
-
-#else /* No BFD64 */
-
-#define LONGEST long long
-#define ULONGEST unsigned long long
-
-#endif /* No BFD64 */
-
 #ifndef min
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #endif
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index db6ddde..e6b2277 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -21,6 +21,8 @@
 
 #include "common-defs.h"
 
+gdb_static_assert (sizeof (CORE_ADDR) >= sizeof (void *));
+
 #ifdef __MINGW32CE__
 #include "wincecompat.h"
 #endif
@@ -63,19 +65,8 @@ int vsnprintf(char *str, size_t size, const char *format, va_list ap);
 #  define PROG "gdbserver"
 #endif
 
-/* A type used for binary buffers.  */
-typedef unsigned char gdb_byte;
-
 #include "buffer.h"
 #include "xml-utils.h"
-
-/* FIXME: This should probably be autoconf'd for.  It's an integer type at
-   least the size of a (void *).  */
-typedef unsigned long long CORE_ADDR;
-
-typedef long long LONGEST;
-typedef unsigned long long ULONGEST;
-
 #include "regcache.h"
 #include "gdb_signals.h"
 #include "target.h"
-- 
1.7.1

Re: [PATCH 2/5 v7] Introduce common-types.h

[Doug Evans]

On Wed, Aug 13, 2014 at 2:56 AM, Gary Benson <gbenson@redhat.com> wrote:
> This introduces common-types.h.  This file defines various standard
> types used by gdb and gdbserver.
>
> Currently these types are conditionally defined based on GDBSERVER.
> The long term goal is to remove all such tests; however, this is
> difficult as currently gdb uses definitions from BFD.  In the meantime
> this is still a step in the right direction.
>
> gdb/
> 2014-08-13  Tom Tromey  <tromey@redhat.com>
>             Gary Benson  <gbenson@redhat.com>
>
>         * common/common-types.h: New file.
>         * Makefile.in (HFILES_NO_SRCDIR): Add common/common-types.h.
>         * common/common-defs.h: Include common-types.h.
>         * defs.h (gdb_byte, CORE_ADDR, CORE_ADDR_MAX, LONGEST)
>         (ULONGEST): Remove.
>
> gdb/gdbserver/
> 2014-08-13  Tom Tromey  <tromey@redhat.com>
>             Gary Benson  <gbenson@redhat.com>
>
>         * server.h: Add static assertion.
>         (gdb_byte, CORE_ADDR, LONGEST, ULONGEST): Remove.

LGTM

[PATCH 5/5 v7] Introduce show_debug_regs

[Gary Benson]

This commit adds a new global flag show_debug_regs to common-debug.h
to replace the flag debug_hw_points used by gdbserver and by the
Linux x86 and AArch64 ports, and to replace the flag maint_show_dr
used by the Linux MIPS port.

gdb/
2014-08-13  Gary Benson  <gbenson@redhat.com>

	* common/common-debug.h (show_debug_regs): Declare.
	* common/common-debug.c (show_debug_regs): Define.
	* aarch64-linux-nat.c (debug_hw_points): Don't define.  Replace
	all uses with show_debug_regs.  Replace all uses that considered
	debug_hw_points as a multi-value integer with straight boolean
	uses.
	* i386-nat.c (debug_hw_points): Don't define.  Replace all uses
	with show_debug_regs.
	* nat/i386-dregs.c (debug_hw_points): Don't declare.  Replace
	all uses with show_debug_regs.
	* mips-linux-nat.c (maint_show_dr): Don't define.  Replace all
	uses with show_debug_regs.

gdb/gdbserver/
2014-08-13  Gary Benson  <gbenson@redhat.com>

	* server.h (debug_hw_points): Don't declare.
	* server.c (debug_hw_points): Don't define.  Replace all uses
	with show_debug_regs.
	* linux-aarch64-low.c (debug_hw_points): Don't define.  Replace
	all uses with show_debug_regs.
---
 gdb/ChangeLog                     |   15 +++++++++++++++
 gdb/aarch64-linux-nat.c           |   30 +++++++++++++-----------------
 gdb/common/common-debug.c         |    4 ++++
 gdb/common/common-debug.h         |    5 +++++
 gdb/gdbserver/ChangeLog           |    8 ++++++++
 gdb/gdbserver/linux-aarch64-low.c |   19 ++++++++-----------
 gdb/gdbserver/server.c            |    7 ++-----
 gdb/gdbserver/server.h            |    1 -
 gdb/i386-nat.c                    |    5 +----
 gdb/mips-linux-nat.c              |   10 +++-------
 gdb/nat/i386-dregs.c              |   13 ++++---------
 11 files changed, 63 insertions(+), 54 deletions(-)

diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c
index 4ae789b..ded938c 100644
--- a/gdb/aarch64-linux-nat.c
+++ b/gdb/aarch64-linux-nat.c
@@ -119,10 +119,6 @@ get_thread_id (ptid_t ptid)
 static int aarch64_num_bp_regs;
 static int aarch64_num_wp_regs;
 
-/* Debugging of hardware breakpoint/watchpoint support.  */
-
-static int debug_hw_points;
-
 /* Each bit of a variable of this type is used to indicate whether a
    hardware breakpoint or watchpoint setting has been changed since
    the last update.
@@ -363,7 +359,7 @@ debug_reg_change_callback (struct lwp_info *lwp, void *ptr)
   if (info == NULL)
     info = lwp->arch_private = XCNEW (struct arch_lwp_info);
 
-  if (debug_hw_points)
+  if (show_debug_regs)
     {
       fprintf_unfiltered (gdb_stdlog,
 			  "debug_reg_change_callback: \n\tOn entry:\n");
@@ -392,7 +388,7 @@ debug_reg_change_callback (struct lwp_info *lwp, void *ptr)
   if (!lwp->stopped)
     linux_stop_lwp (lwp);
 
-  if (debug_hw_points)
+  if (show_debug_regs)
     {
       fprintf_unfiltered (gdb_stdlog,
 			  "\tOn exit:\n\tpid%d, dr_changed_bp=0x%s, "
@@ -677,7 +673,7 @@ aarch64_linux_prepare_to_resume (struct lwp_info *lwp)
       struct aarch64_debug_reg_state *state
 	= aarch64_get_debug_reg_state (ptid_get_pid (lwp->ptid));
 
-      if (debug_hw_points)
+      if (show_debug_regs)
 	fprintf_unfiltered (gdb_stdlog, "prepare_to_resume thread %d\n", tid);
 
       /* Watchpoints.  */
@@ -1200,7 +1196,7 @@ aarch64_linux_insert_hw_breakpoint (struct target_ops *self,
   const int len = 4;
   const int type = hw_execute;
 
-  if (debug_hw_points)
+  if (show_debug_regs)
     fprintf_unfiltered
       (gdb_stdlog,
        "insert_hw_breakpoint on entry (addr=0x%08lx, len=%d))\n",
@@ -1208,7 +1204,7 @@ aarch64_linux_insert_hw_breakpoint (struct target_ops *self,
 
   ret = aarch64_handle_breakpoint (type, addr, len, 1 /* is_insert */);
 
-  if (debug_hw_points > 1)
+  if (show_debug_regs)
     {
       struct aarch64_debug_reg_state *state
 	= aarch64_get_debug_reg_state (ptid_get_pid (inferior_ptid));
@@ -1233,14 +1229,14 @@ aarch64_linux_remove_hw_breakpoint (struct target_ops *self,
   const int len = 4;
   const int type = hw_execute;
 
-  if (debug_hw_points)
+  if (show_debug_regs)
     fprintf_unfiltered
       (gdb_stdlog, "remove_hw_breakpoint on entry (addr=0x%08lx, len=%d))\n",
        (unsigned long) addr, len);
 
   ret = aarch64_handle_breakpoint (type, addr, len, 0 /* is_insert */);
 
-  if (debug_hw_points > 1)
+  if (show_debug_regs)
     {
       struct aarch64_debug_reg_state *state
 	= aarch64_get_debug_reg_state (ptid_get_pid (inferior_ptid));
@@ -1297,7 +1293,7 @@ aarch64_handle_unaligned_watchpoint (int type, CORE_ADDR addr, int len,
 	ret = aarch64_dr_state_remove_one_point (state, type, aligned_addr,
 						 aligned_len);
 
-      if (debug_hw_points)
+      if (show_debug_regs)
 	fprintf_unfiltered (gdb_stdlog,
 "handle_unaligned_watchpoint: is_insert: %d\n"
 "                             aligned_addr: 0x%08lx, aligned_len: %d\n"
@@ -1335,7 +1331,7 @@ aarch64_linux_insert_watchpoint (struct target_ops *self,
 {
   int ret;
 
-  if (debug_hw_points)
+  if (show_debug_regs)
     fprintf_unfiltered (gdb_stdlog,
 			"insert_watchpoint on entry (addr=0x%08lx, len=%d)\n",
 			(unsigned long) addr, len);
@@ -1344,7 +1340,7 @@ aarch64_linux_insert_watchpoint (struct target_ops *self,
 
   ret = aarch64_handle_watchpoint (type, addr, len, 1 /* is_insert */);
 
-  if (debug_hw_points > 1)
+  if (show_debug_regs)
     {
       struct aarch64_debug_reg_state *state
 	= aarch64_get_debug_reg_state (ptid_get_pid (inferior_ptid));
@@ -1368,7 +1364,7 @@ aarch64_linux_remove_watchpoint (struct target_ops *self,
 {
   int ret;
 
-  if (debug_hw_points)
+  if (show_debug_regs)
     fprintf_unfiltered (gdb_stdlog,
 			"remove_watchpoint on entry (addr=0x%08lx, len=%d)\n",
 			(unsigned long) addr, len);
@@ -1377,7 +1373,7 @@ aarch64_linux_remove_watchpoint (struct target_ops *self,
 
   ret = aarch64_handle_watchpoint (type, addr, len, 0 /* is_insert */);
 
-  if (debug_hw_points > 1)
+  if (show_debug_regs)
     {
       struct aarch64_debug_reg_state *state
 	= aarch64_get_debug_reg_state (ptid_get_pid (inferior_ptid));
@@ -1496,7 +1492,7 @@ add_show_debug_regs_command (void)
   /* A maintenance command to enable printing the internal DRi mirror
      variables.  */
   add_setshow_boolean_cmd ("show-debug-regs", class_maintenance,
-			   &debug_hw_points, _("\
+			   &show_debug_regs, _("\
 Set whether to show variables that mirror the AArch64 debug registers."), _("\
 Show whether to show variables that mirror the AArch64 debug registers."), _("\
 Use \"on\" to enable, \"off\" to disable.\n\
diff --git a/gdb/common/common-debug.c b/gdb/common/common-debug.c
index 660fc70..5cac3bf 100644
--- a/gdb/common/common-debug.c
+++ b/gdb/common/common-debug.c
@@ -26,6 +26,10 @@
 
 /* See common/common-debug.h.  */
 
+int show_debug_regs;
+
+/* See common/common-debug.h.  */
+
 void
 debug_printf (const char *fmt, ...)
 {
diff --git a/gdb/common/common-debug.h b/gdb/common/common-debug.h
index c2bb192..348b0e3 100644
--- a/gdb/common/common-debug.h
+++ b/gdb/common/common-debug.h
@@ -20,6 +20,11 @@
 #ifndef COMMON_DEBUG_H
 #define COMMON_DEBUG_H
 
+/* Set to nonzero to enable debugging of hardware breakpoint/
+   watchpoint support code.  */
+
+extern int show_debug_regs;
+
 /* Print a formatted message to the appropriate channel for
    debugging output for the client.  */
 
diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c
index 6066e15..ca096b0 100644
--- a/gdb/gdbserver/linux-aarch64-low.c
+++ b/gdb/gdbserver/linux-aarch64-low.c
@@ -267,9 +267,6 @@ aarch64_store_fpregset (struct regcache *regcache, const void *buf)
     supply_register (regcache, AARCH64_V0_REGNO + i, &regset->vregs[i]);
 }
 
-/* Debugging of hardware breakpoint/watchpoint support.  */
-extern int debug_hw_points;
-
 /* Enable miscellaneous debugging output.  The name is historical - it
    was originally used to debug LinuxThreads support.  */
 extern int debug_threads;
@@ -626,7 +623,7 @@ debug_reg_change_callback (struct inferior_list_entry *entry, void *ptr)
   dr_changed_t *dr_changed_ptr;
   dr_changed_t dr_changed;
 
-  if (debug_hw_points)
+  if (show_debug_regs)
     {
       fprintf (stderr, "debug_reg_change_callback: \n\tOn entry:\n");
       fprintf (stderr, "\tpid%d, tid: %ld, dr_changed_bp=0x%llx, "
@@ -677,7 +674,7 @@ debug_reg_change_callback (struct inferior_list_entry *entry, void *ptr)
 	linux_stop_lwp (lwp);
     }
 
-  if (debug_hw_points)
+  if (show_debug_regs)
     {
       fprintf (stderr, "\tOn exit:\n\tpid%d, tid: %ld, dr_changed_bp=0x%llx, "
 	       "dr_changed_wp=0x%llx\n",
@@ -917,7 +914,7 @@ aarch64_handle_unaligned_watchpoint (enum target_hw_bp_type type,
 	ret = aarch64_dr_state_remove_one_point (state, type, aligned_addr,
 						 aligned_len);
 
-      if (debug_hw_points)
+      if (show_debug_regs)
 	fprintf (stderr,
  "handle_unaligned_watchpoint: is_insert: %d\n"
  "                             aligned_addr: 0x%s, aligned_len: %d\n"
@@ -973,7 +970,7 @@ aarch64_insert_point (enum raw_bkpt_type type, CORE_ADDR addr,
   int ret;
   enum target_hw_bp_type targ_type;
 
-  if (debug_hw_points)
+  if (show_debug_regs)
     fprintf (stderr, "insert_point on entry (addr=0x%08lx, len=%d)\n",
 	     (unsigned long) addr, len);
 
@@ -987,7 +984,7 @@ aarch64_insert_point (enum raw_bkpt_type type, CORE_ADDR addr,
     ret =
       aarch64_handle_breakpoint (targ_type, addr, len, 1 /* is_insert */);
 
-  if (debug_hw_points > 1)
+  if (show_debug_regs > 1)
     aarch64_show_debug_reg_state (aarch64_get_debug_reg_state (),
 				  "insert_point", addr, len, targ_type);
 
@@ -1009,7 +1006,7 @@ aarch64_remove_point (enum raw_bkpt_type type, CORE_ADDR addr,
   int ret;
   enum target_hw_bp_type targ_type;
 
-  if (debug_hw_points)
+  if (show_debug_regs)
     fprintf (stderr, "remove_point on entry (addr=0x%08lx, len=%d)\n",
 	     (unsigned long) addr, len);
 
@@ -1024,7 +1021,7 @@ aarch64_remove_point (enum raw_bkpt_type type, CORE_ADDR addr,
     ret =
       aarch64_handle_breakpoint (targ_type, addr, len, 0 /* is_insert */);
 
-  if (debug_hw_points > 1)
+  if (show_debug_regs > 1)
     aarch64_show_debug_reg_state (aarch64_get_debug_reg_state (),
 				  "remove_point", addr, len, targ_type);
 
@@ -1150,7 +1147,7 @@ aarch64_linux_prepare_to_resume (struct lwp_info *lwp)
       struct aarch64_debug_reg_state *state
 	= &proc->private->arch_private->debug_reg_state;
 
-      if (debug_hw_points)
+      if (show_debug_regs)
 	fprintf (stderr, "prepare_to_resume thread %ld\n", lwpid_of (thread));
 
       /* Watchpoints.  */
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index cf1dffe..500260c 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -69,9 +69,6 @@ int disable_randomization = 1;
 
 static char **program_argv, **wrapper_argv;
 
-/* Enable debugging of h/w breakpoint/watchpoint support.  */
-int debug_hw_points;
-
 int pass_signals[GDB_SIGNAL_LAST];
 int program_signals[GDB_SIGNAL_LAST];
 int program_signals_p;
@@ -1014,12 +1011,12 @@ handle_monitor_command (char *mon, char *own_buf)
     }
   else if (strcmp (mon, "set debug-hw-points 1") == 0)
     {
-      debug_hw_points = 1;
+      show_debug_regs = 1;
       monitor_output ("H/W point debugging output enabled.\n");
     }
   else if (strcmp (mon, "set debug-hw-points 0") == 0)
     {
-      debug_hw_points = 0;
+      show_debug_regs = 0;
       monitor_output ("H/W point debugging output disabled.\n");
     }
   else if (strcmp (mon, "set remote-debug 1") == 0)
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index e6b2277..97498a6 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -84,7 +84,6 @@ extern ptid_t cont_thread;
 extern ptid_t general_thread;
 
 extern int server_waiting;
-extern int debug_hw_points;
 extern int pass_signals[];
 extern int program_signals[];
 extern int program_signals_p;
diff --git a/gdb/i386-nat.c b/gdb/i386-nat.c
index 499fffb..4a64759 100644
--- a/gdb/i386-nat.c
+++ b/gdb/i386-nat.c
@@ -33,9 +33,6 @@
    The functions below implement debug registers sharing by reference
    counts, and allow to watch regions up to 16 bytes long.  */
 
-/* Whether or not to print the mirrored debug registers.  */
-int debug_hw_points;
-
 /* Low-level function vector.  */
 struct i386_dr_low_type i386_dr_low;
 
@@ -272,7 +269,7 @@ add_show_debug_regs_command (void)
   /* A maintenance command to enable printing the internal DRi mirror
      variables.  */
   add_setshow_boolean_cmd ("show-debug-regs", class_maintenance,
-			   &debug_hw_points, _("\
+			   &show_debug_regs, _("\
 Set whether to show variables that mirror the x86 debug registers."), _("\
 Show whether to show variables that mirror the x86 debug registers."), _("\
 Use \"on\" to enable, \"off\" to disable.\n\
diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
index 88faa1e..daf2307 100644
--- a/gdb/mips-linux-nat.c
+++ b/gdb/mips-linux-nat.c
@@ -50,10 +50,6 @@
    we'll clear this and use PTRACE_PEEKUSER instead.  */
 static int have_ptrace_regsets = 1;
 
-/* Whether or not to print the mirrored debug registers.  */
-
-static int maint_show_dr;
-
 /* Saved function pointers to fetch and store a single register using
    PTRACE_PEEKUSER and PTRACE_POKEUSER.  */
 
@@ -689,7 +685,7 @@ mips_linux_insert_watchpoint (struct target_ops *self,
   watch_mirror = regs;
   retval = write_watchpoint_regs ();
 
-  if (maint_show_dr)
+  if (show_debug_regs)
     mips_show_dr ("insert_watchpoint", addr, len, type);
 
   return retval;
@@ -737,7 +733,7 @@ mips_linux_remove_watchpoint (struct target_ops *self,
 
   retval = write_watchpoint_regs ();
 
-  if (maint_show_dr)
+  if (show_debug_regs)
     mips_show_dr ("remove_watchpoint", addr, len, type);
 
   return retval;
@@ -774,7 +770,7 @@ _initialize_mips_linux_nat (void)
   struct target_ops *t;
 
   add_setshow_boolean_cmd ("show-debug-regs", class_maintenance,
-			   &maint_show_dr, _("\
+			   &show_debug_regs, _("\
 Set whether to show variables that mirror the mips debug registers."), _("\
 Show whether to show variables that mirror the mips debug registers."), _("\
 Use \"on\" to enable, \"off\" to disable.\n\
diff --git a/gdb/nat/i386-dregs.c b/gdb/nat/i386-dregs.c
index e3272cd..7afe09b 100644
--- a/gdb/nat/i386-dregs.c
+++ b/gdb/nat/i386-dregs.c
@@ -175,11 +175,6 @@
 /* Types of operations supported by i386_handle_nonaligned_watchpoint.  */
 typedef enum { WP_INSERT, WP_REMOVE, WP_COUNT } i386_wp_op_t;
 
-#ifndef GDBSERVER
-/* Whether or not to print the mirrored debug registers.  */
-extern int debug_hw_points;
-#endif
-
 /* Print the values of the mirrored debug registers.  */
 
 static void
@@ -511,7 +506,7 @@ i386_dr_insert_watchpoint (struct i386_debug_reg_state *state,
   if (retval == 0)
     i386_update_inferior_debug_regs (state, &local_state);
 
-  if (debug_hw_points)
+  if (show_debug_regs)
     i386_show_dr (state, "insert_watchpoint", addr, len, type);
 
   return retval;
@@ -550,7 +545,7 @@ i386_dr_remove_watchpoint (struct i386_debug_reg_state *state,
   if (retval == 0)
     i386_update_inferior_debug_regs (state, &local_state);
 
-  if (debug_hw_points)
+  if (show_debug_regs)
     i386_show_dr (state, "remove_watchpoint", addr, len, type);
 
   return retval;
@@ -640,12 +635,12 @@ i386_dr_stopped_data_address (struct i386_debug_reg_state *state,
 	{
 	  addr = i386_dr_low_get_addr (i);
 	  rc = 1;
-	  if (debug_hw_points)
+	  if (show_debug_regs)
 	    i386_show_dr (state, "watchpoint_hit", addr, -1, hw_write);
 	}
     }
 
-  if (debug_hw_points && addr == 0)
+  if (show_debug_regs && addr == 0)
     i386_show_dr (state, "stopped_data_addr", 0, 0, hw_write);
 
   if (rc)
-- 
1.7.1

Re: [PATCH 5/5 v7] Introduce show_debug_regs

[Doug Evans]

On Wed, Aug 13, 2014 at 2:56 AM, Gary Benson <gbenson@redhat.com> wrote:
> This commit adds a new global flag show_debug_regs to common-debug.h
> to replace the flag debug_hw_points used by gdbserver and by the
> Linux x86 and AArch64 ports, and to replace the flag maint_show_dr
> used by the Linux MIPS port.
>
> gdb/
> 2014-08-13  Gary Benson  <gbenson@redhat.com>
>
>         * common/common-debug.h (show_debug_regs): Declare.
>         * common/common-debug.c (show_debug_regs): Define.
>         * aarch64-linux-nat.c (debug_hw_points): Don't define.  Replace
>         all uses with show_debug_regs.  Replace all uses that considered
>         debug_hw_points as a multi-value integer with straight boolean
>         uses.
>         * i386-nat.c (debug_hw_points): Don't define.  Replace all uses
>         with show_debug_regs.
>         * nat/i386-dregs.c (debug_hw_points): Don't declare.  Replace
>         all uses with show_debug_regs.
>         * mips-linux-nat.c (maint_show_dr): Don't define.  Replace all
>         uses with show_debug_regs.
>
> gdb/gdbserver/
> 2014-08-13  Gary Benson  <gbenson@redhat.com>
>
>         * server.h (debug_hw_points): Don't declare.
>         * server.c (debug_hw_points): Don't define.  Replace all uses
>         with show_debug_regs.
>         * linux-aarch64-low.c (debug_hw_points): Don't define.  Replace
>         all uses with show_debug_regs.

I'd let this one sit for awhile longer, to give others a bit more time
to comment if they want.

[PATCH 1/5 v7] Introduce common/errors.h

[Gary Benson]

This introduces common/errors.h.  This holds some error- and warning-
related declarations that can be used by the code in common, nat and
target.  Some of the declared functions must be provided by the client
as documented by the header file comments.

gdb/
2014-08-13  Tom Tromey  <tromey@redhat.com>
	    Gary Benson  <gbenson@redhat.com>

	* common/errors.h: New file.
	* common/errors.c: Likewise.
	* Makefile.in (SFILES): Add common/errors.c.
	(HFILES_NO_SRCDIR): Add common/errors.h.
	(COMMON_OBS): Add errors.o.
	(errors.o): New rule.
	* common/common-defs.h: Include errors.h.
	* utils.h (perror_with_name, error, verror, warning, vwarning):
	Don't declare.
	* common/common-utils.h: (malloc_failure, internal_error):
	Likewise.

gdb/gdbserver/
2014-08-13  Tom Tromey  <tromey@redhat.com>
	    Gary Benson  <gbenson@redhat.com>

	* Makefile.in (SFILES): Add common/errors.c.
	(OBS): Add errors.o.
	(IPA_OBS): Add errors-ipa.o.
	(errors.o): New rule.
	(errors-ipa.o): Likewise.
	* utils.h (perror_with_name, error, warning): Don't declare.
	* utils.c (warning): Renamed and rewritten as...
	(vwarning): New function.
	(error): Renamed and rewritten as...
	(verror): New function.
	(internal_error): Renamed and rewritten as...
	(internal_verror): New function.
---
 gdb/ChangeLog             |   15 +++++++++
 gdb/Makefile.in           |   11 +++++--
 gdb/common/common-defs.h  |    1 +
 gdb/common/common-utils.h |    4 --
 gdb/common/errors.c       |   61 ++++++++++++++++++++++++++++++++++++
 gdb/common/errors.h       |   75 +++++++++++++++++++++++++++++++++++++++++++++
 gdb/gdbserver/ChangeLog   |   16 +++++++++
 gdb/gdbserver/Makefile.in |   16 ++++++++--
 gdb/gdbserver/utils.c     |   23 ++++---------
 gdb/gdbserver/utils.h     |    3 --
 gdb/utils.c               |   36 ---------------------
 gdb/utils.h               |   15 ---------
 12 files changed, 196 insertions(+), 80 deletions(-)
 create mode 100644 gdb/common/errors.c
 create mode 100644 gdb/common/errors.h

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 8361030..fa0dcd4 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -850,7 +850,8 @@ SFILES = ada-exp.y ada-lang.c ada-typeprint.c ada-valprint.c ada-tasks.c \
 	common/gdb_vecs.c common/common-utils.c common/xml-utils.c \
 	common/ptid.c common/buffer.c gdb-dlfcn.c common/agent.c \
 	common/format.c common/filestuff.c btrace.c record-btrace.c ctf.c \
-	target/waitstatus.c common/print-utils.c common/rsp-low.c
+	target/waitstatus.c common/print-utils.c common/rsp-low.c \
+	common/errors.c
 
 LINTFILES = $(SFILES) $(YYFILES) $(CONFIG_SRCS) init.c
 
@@ -935,7 +936,7 @@ gdb_bfd.h sparc-ravenscar-thread.h ppc-ravenscar-thread.h nat/linux-btrace.h \
 ctf.h nat/i386-cpuid.h nat/i386-gcc-cpuid.h target/resume.h \
 target/wait.h target/waitstatus.h nat/linux-nat.h nat/linux-waitpid.h \
 common/print-utils.h common/rsp-low.h nat/i386-dregs.h x86-linux-nat.h \
-i386-linux-nat.h common/common-defs.h
+i386-linux-nat.h common/common-defs.h common/errors.h
 
 # Header files that already have srcdir in them, or which are in objdir.
 
@@ -1034,7 +1035,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
 	gdb_vecs.o jit.o progspace.o skip.o probe.o \
 	common-utils.o buffer.o ptid.o gdb-dlfcn.o common-agent.o \
 	format.o registry.o btrace.o record-btrace.o waitstatus.o \
-	print-utils.o rsp-low.o
+	print-utils.o rsp-low.o errors.o
 
 TSOBS = inflow.o
 
@@ -2144,6 +2145,10 @@ rsp-low.o: ${srcdir}/common/rsp-low.c
 	$(COMPILE) $(srcdir)/common/rsp-low.c
 	$(POSTCOMPILE)
 
+errors.o: ${srcdir}/common/errors.c
+	$(COMPILE) $(srcdir)/common/errors.c
+	$(POSTCOMPILE)
+
 #
 # gdb/target/ dependencies
 #
diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h
index 82290dc..a15423c 100644
--- a/gdb/common/common-defs.h
+++ b/gdb/common/common-defs.h
@@ -41,5 +41,6 @@
 #include "ptid.h"
 #include "common-utils.h"
 #include "gdb_assert.h"
+#include "errors.h"
 
 #endif /* COMMON_DEFS_H */
diff --git a/gdb/common/common-utils.h b/gdb/common/common-utils.h
index 9038bc2..67615ba 100644
--- a/gdb/common/common-utils.h
+++ b/gdb/common/common-utils.h
@@ -38,10 +38,6 @@
 #endif
 #endif
 
-extern void malloc_failure (long size) ATTRIBUTE_NORETURN;
-extern void internal_error (const char *file, int line, const char *, ...)
-     ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (3, 4);
-
 /* xmalloc(), xrealloc() and xcalloc() have already been declared in
    "libiberty.h". */
 
diff --git a/gdb/common/errors.c b/gdb/common/errors.c
new file mode 100644
index 0000000..7d0bb6e
--- /dev/null
+++ b/gdb/common/errors.c
@@ -0,0 +1,61 @@
+/* Error reporting facilities.
+
+   Copyright (C) 1986-2014 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/>.  */
+
+#ifdef GDBSERVER
+#include "server.h"
+#else
+#include "defs.h"
+#endif
+#include "errors.h"
+
+/* See common/errors.h.  */
+
+void
+warning (const char *fmt, ...)
+{
+  va_list ap;
+
+  va_start (ap, fmt);
+  vwarning (fmt, ap);
+  va_end (ap);
+}
+
+/* See common/errors.h.  */
+
+void
+error (const char *fmt, ...)
+{
+  va_list ap;
+
+  va_start (ap, fmt);
+  verror (fmt, ap);
+  va_end (ap);
+}
+
+/* See common/errors.h.  */
+
+void
+internal_error (const char *file, int line, const char *fmt, ...)
+{
+  va_list ap;
+
+  va_start (ap, fmt);
+  internal_verror (file, line, fmt, ap);
+  va_end (ap);
+}
diff --git a/gdb/common/errors.h b/gdb/common/errors.h
new file mode 100644
index 0000000..4e6c2b3
--- /dev/null
+++ b/gdb/common/errors.h
@@ -0,0 +1,75 @@
+/* Declarations for error-reporting facilities.
+
+   Copyright (C) 1986-2014 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 COMMON_ERRORS_H
+#define COMMON_ERRORS_H
+
+/* A problem was detected, but the requested operation can still
+   proceed.  A warning message is constructed using a printf- or
+   vprintf-style argument list.  The function "vwarning" must be
+   provided by the client.  */
+
+extern void warning (const char *fmt, ...)
+     ATTRIBUTE_PRINTF (1, 2);
+
+extern void vwarning (const char *fmt, va_list args)
+     ATTRIBUTE_PRINTF (1, 0);
+
+/* A non-predictable, non-fatal error was detected.  The requested
+   operation cannot proceed.  An error message is constructed using
+   a printf- or vprintf-style argument list.  These functions do not
+   return.  The function "verror" must be provided by the client.  */
+
+extern void error (const char *fmt, ...)
+     ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 2);
+
+extern void verror (const char *fmt, va_list args)
+     ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 0);
+
+/* An internal error was detected.  Internal errors indicate
+   programming errors such as assertion failures, as opposed to
+   more general errors beyond the application's control.  These
+   functions do not return.  An error message is constructed using
+   a printf- or vprintf-style argument list.  FILE and LINE
+   indicate the file and line number where the programming error
+   was detected.  The function "internal_verror" must be provided
+   by the client.  */
+
+extern void internal_error (const char *file, int line,
+			    const char *fmt, ...)
+     ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (3, 4);
+
+extern void internal_verror (const char *file, int line,
+			     const char *fmt, va_list args)
+     ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (3, 0);
+\f
+
+/* Like "error", but the error message is constructed by combining
+   STRING with the system error message for errno.  This function does
+   not return.  This function must be provided by the client.  */
+
+extern void perror_with_name (const char *string) ATTRIBUTE_NORETURN;
+
+/* Call this function to handle memory allocation failures.  This
+   function does not return.  This function must be provided by the
+   client.  */
+
+extern void malloc_failure (long size) ATTRIBUTE_NORETURN;
+
+#endif /* COMMON_ERRORS_H */
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index f9a2f17..1faa00c 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -169,7 +169,7 @@ SFILES=	$(srcdir)/gdbreplay.c $(srcdir)/inferiors.c $(srcdir)/dll.c \
 	$(srcdir)/common/buffer.c $(srcdir)/nat/linux-btrace.c \
 	$(srcdir)/common/filestuff.c $(srcdir)/target/waitstatus.c \
 	$(srcdir)/nat/mips-linux-watch.c $(srcdir)/common/print-utils.c \
-	$(srcdir)/common/rsp-low.c
+	$(srcdir)/common/rsp-low.c $(srcdir)/common/errors.c
 
 DEPFILES = @GDBSERVER_DEPFILES@
 
@@ -182,7 +182,8 @@ OBS = agent.o ax.o inferiors.o regcache.o remote-utils.o server.o signals.o \
       target.o waitstatus.o utils.o debug.o version.o vec.o gdb_vecs.o \
       mem-break.o hostio.o event-loop.o tracepoint.o xml-utils.o \
       common-utils.o ptid.o buffer.o format.o filestuff.o dll.o notif.o \
-      tdesc.o print-utils.o rsp-low.o $(XML_BUILTIN) $(DEPFILES) $(LIBOBJS)
+      tdesc.o print-utils.o rsp-low.o errors.o $(XML_BUILTIN) $(DEPFILES) \
+      $(LIBOBJS)
 GDBREPLAY_OBS = gdbreplay.o version.o
 GDBSERVER_LIBS = @GDBSERVER_LIBS@
 XM_CLIBS = @LIBS@
@@ -300,7 +301,10 @@ gdbreplay$(EXEEXT): $(GDBREPLAY_OBS) $(LIBGNU) $(LIBIBERTY)
 	${CC-LD} $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) -o gdbreplay$(EXEEXT) $(GDBREPLAY_OBS) \
 	  $(XM_CLIBS) $(LIBGNU) $(LIBIBERTY)
 
-IPA_OBJS=ax-ipa.o tracepoint-ipa.o format-ipa.o utils-ipa.o regcache-ipa.o remote-utils-ipa.o common-utils-ipa.o tdesc-ipa.o print-utils-ipa.o rsp-low-ipa.o ${IPA_DEPFILES}
+IPA_OBJS=ax-ipa.o tracepoint-ipa.o format-ipa.o utils-ipa.o \
+	regcache-ipa.o remote-utils-ipa.o common-utils-ipa.o \
+	tdesc-ipa.o print-utils-ipa.o rsp-low-ipa.o errors-ipa.o \
+	${IPA_DEPFILES}
 
 IPA_LIB=libinproctrace.so
 
@@ -489,6 +493,9 @@ print-utils-ipa.o: ../common/print-utils.c
 rsp-low-ipa.o: ../common/rsp-low.c
 	$(IPAGENT_COMPILE) $<
 	$(POSTCOMPILE)
+errors-ipa.o: ../common/errors.c
+	$(IPAGENT_COMPILE) $<
+	$(POSTCOMPILE)
 
 ax.o: ax.c
 	$(COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
@@ -530,6 +537,9 @@ filestuff.o: ../common/filestuff.c
 agent.o: ../common/agent.c
 	$(COMPILE) $<
 	$(POSTCOMPILE)
+errors.o: ../common/errors.c
+	$(COMPILE) $<
+	$(POSTCOMPILE)
 waitstatus.o: ../target/waitstatus.c
 	$(COMPILE) $<
 	$(POSTCOMPILE)
diff --git a/gdb/gdbserver/utils.c b/gdb/gdbserver/utils.c
index b011637..3aac3cd 100644
--- a/gdb/gdbserver/utils.c
+++ b/gdb/gdbserver/utils.c
@@ -71,18 +71,15 @@ perror_with_name (const char *string)
   error ("%s.", combined);
 }
 
-/* Print an error message and return to command level.
-   STRING is the error message, used as a fprintf string,
-   and ARG is passed as an argument to it.  */
+/* Print an error message and return to top level.  */
 
 void
-error (const char *string,...)
+verror (const char *string, va_list args)
 {
 #ifndef IN_PROCESS_AGENT
   extern jmp_buf toplevel;
 #endif
-  va_list args;
-  va_start (args, string);
+
   fflush (stdout);
   vfprintf (stderr, string, args);
   fprintf (stderr, "\n");
@@ -110,31 +107,25 @@ fatal (const char *string,...)
   exit (1);
 }
 
-/* VARARGS */
+/* Print a warning message.  */
+
 void
-warning (const char *string,...)
+vwarning (const char *string, va_list args)
 {
-  va_list args;
-  va_start (args, string);
   fprintf (stderr, PREFIX);
   vfprintf (stderr, string, args);
   fprintf (stderr, "\n");
-  va_end (args);
 }
 
 /* Report a problem internal to GDBserver, and exit.  */
 
 void
-internal_error (const char *file, int line, const char *fmt, ...)
+internal_verror (const char *file, int line, const char *fmt, va_list args)
 {
-  va_list args;
-  va_start (args, fmt);
-
   fprintf (stderr,  "\
 %s:%d: A problem internal to " TOOLNAME " has been detected.\n", file, line);
   vfprintf (stderr, fmt, args);
   fprintf (stderr, "\n");
-  va_end (args);
   exit (1);
 }
 
diff --git a/gdb/gdbserver/utils.h b/gdb/gdbserver/utils.h
index 906924b..a994f38 100644
--- a/gdb/gdbserver/utils.h
+++ b/gdb/gdbserver/utils.h
@@ -21,10 +21,7 @@
 
 #include "print-utils.h"
 
-void perror_with_name (const char *string) ATTRIBUTE_NORETURN;
-void error (const char *string,...) ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 2);
 void fatal (const char *string,...) ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 2);
-void warning (const char *string,...) ATTRIBUTE_PRINTF (1, 2);
 char *paddress (CORE_ADDR addr);
 char *pfildes (gdb_fildes_t fd);
 
diff --git a/gdb/utils.c b/gdb/utils.c
index 34b842e..2b64023 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -530,22 +530,6 @@ vwarning (const char *string, va_list args)
     }
 }
 
-/* Print a warning message.
-   The first argument STRING is the warning message, used as a fprintf string,
-   and the remaining args are passed as arguments to it.
-   The primary difference between warnings and errors is that a warning
-   does not force the return to command level.  */
-
-void
-warning (const char *string, ...)
-{
-  va_list args;
-
-  va_start (args, string);
-  vwarning (string, args);
-  va_end (args);
-}
-
 /* Print an error message and return to command level.
    The first argument STRING is the error message, used as a fprintf string,
    and the remaining args are passed as arguments to it.  */
@@ -557,16 +541,6 @@ verror (const char *string, va_list args)
 }
 
 void
-error (const char *string, ...)
-{
-  va_list args;
-
-  va_start (args, string);
-  throw_verror (GENERIC_ERROR, string, args);
-  va_end (args);
-}
-
-void
 error_stream (struct ui_file *stream)
 {
   char *message = ui_file_xstrdup (stream, NULL);
@@ -813,16 +787,6 @@ internal_verror (const char *file, int line, const char *fmt, va_list ap)
   throw_quit (_("Command aborted."));
 }
 
-void
-internal_error (const char *file, int line, const char *string, ...)
-{
-  va_list ap;
-
-  va_start (ap, string);
-  internal_verror (file, line, string, ap);
-  va_end (ap);
-}
-
 static struct internal_problem internal_warning_problem = {
   "internal-warning", 1, internal_problem_ask, 1, internal_problem_ask
 };
diff --git a/gdb/utils.h b/gdb/utils.h
index cc79562..18a95a7 100644
--- a/gdb/utils.h
+++ b/gdb/utils.h
@@ -269,7 +269,6 @@ extern void fprintf_symbol_filtered (struct ui_file *, const char *,
 
 extern void throw_perror_with_name (enum errors errcode, const char *string)
   ATTRIBUTE_NORETURN;
-extern void perror_with_name (const char *) ATTRIBUTE_NORETURN;
 
 extern void perror_warning_with_name (const char *string);
 
@@ -283,18 +282,8 @@ extern void (*deprecated_error_begin_hook) (void);
 
 extern char *warning_pre_print;
 
-extern void verror (const char *fmt, va_list ap)
-     ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 0);
-
-extern void error (const char *fmt, ...)
-     ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 2);
-
 extern void error_stream (struct ui_file *) ATTRIBUTE_NORETURN;
 
-extern void internal_verror (const char *file, int line, const char *,
-			     va_list ap)
-     ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (3, 0);
-
 extern void internal_vwarning (const char *file, int line,
 			       const char *, va_list ap)
      ATTRIBUTE_PRINTF (3, 0);
@@ -302,10 +291,6 @@ extern void internal_vwarning (const char *file, int line,
 extern void internal_warning (const char *file, int line,
 			      const char *, ...) ATTRIBUTE_PRINTF (3, 4);
 
-extern void warning (const char *, ...) ATTRIBUTE_PRINTF (1, 2);
-
-extern void vwarning (const char *, va_list args) ATTRIBUTE_PRINTF (1, 0);
-
 extern void demangler_vwarning (const char *file, int line,
 			       const char *, va_list ap)
      ATTRIBUTE_PRINTF (3, 0);
-- 
1.7.1

Re: [PATCH 1/5 v7] Introduce common/errors.h

[Doug Evans]

On Wed, Aug 13, 2014 at 2:56 AM, Gary Benson <gbenson@redhat.com> wrote:
> This introduces common/errors.h.  This holds some error- and warning-
> related declarations that can be used by the code in common, nat and
> target.  Some of the declared functions must be provided by the client
> as documented by the header file comments.
>
> gdb/
> 2014-08-13  Tom Tromey  <tromey@redhat.com>
>             Gary Benson  <gbenson@redhat.com>
>
>         * common/errors.h: New file.
>         * common/errors.c: Likewise.
>         * Makefile.in (SFILES): Add common/errors.c.
>         (HFILES_NO_SRCDIR): Add common/errors.h.
>         (COMMON_OBS): Add errors.o.
>         (errors.o): New rule.
>         * common/common-defs.h: Include errors.h.
>         * utils.h (perror_with_name, error, verror, warning, vwarning):
>         Don't declare.
>         * common/common-utils.h: (malloc_failure, internal_error):
>         Likewise.
>
> gdb/gdbserver/
> 2014-08-13  Tom Tromey  <tromey@redhat.com>
>             Gary Benson  <gbenson@redhat.com>
>
>         * Makefile.in (SFILES): Add common/errors.c.
>         (OBS): Add errors.o.
>         (IPA_OBS): Add errors-ipa.o.
>         (errors.o): New rule.
>         (errors-ipa.o): Likewise.
>         * utils.h (perror_with_name, error, warning): Don't declare.
>         * utils.c (warning): Renamed and rewritten as...
>         (vwarning): New function.
>         (error): Renamed and rewritten as...
>         (verror): New function.
>         (internal_error): Renamed and rewritten as...
>         (internal_verror): New function.

LGTM