From patchwork Sun Jun 7 20:04:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kratochvil X-Patchwork-Id: 7060 Received: (qmail 104682 invoked by alias); 7 Jun 2015 20:05:03 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 104669 invoked by uid 89); 7 Jun 2015 20:05:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL, BAYES_05, KAM_LAZY_DOMAIN_SECURITY, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=no version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Sun, 07 Jun 2015 20:04:58 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 14FCE19F972; Sun, 7 Jun 2015 20:04:57 +0000 (UTC) Received: from host1.jankratochvil.net (ovpn-116-44.ams2.redhat.com [10.36.116.44]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t57K4tgn021204; Sun, 7 Jun 2015 16:04:55 -0400 Subject: [PATCH v6 04/10] Create empty common/linux-maps.[ch] and common/target-utils.[ch] From: Jan Kratochvil To: gdb-patches@sourceware.org Cc: Aleksandar Ristovski Date: Sun, 07 Jun 2015 22:04:54 +0200 Message-ID: <20150607200454.8918.52868.stgit@host1.jankratochvil.net> In-Reply-To: <20150607200422.8918.48900.stgit@host1.jankratochvil.net> References: <20150607200422.8918.48900.stgit@host1.jankratochvil.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-IsSubscribed: yes Hi, prepare new files for later move. Approved by: https://sourceware.org/ml/gdb-patches/2014-05/msg00367.html Jan gdb/ChangeLog 2014-02-26 Aleksandar Ristovski Create empty common/linux-maps.[ch] and common/target-utils.[ch]. * Makefile.in (HFILES_NO_SRCDIR); Add common/linux-maps.h, common/target-utils.h. (COMMON_OBS): Add target-utils.o. (linux-maps.o, target-utils.o): New. * common/linux-maps.c: New file. * common/linux-maps.h: New file. * common/target-utils.c: New file. * common/target-utils.h: New file. * config/i386/linux.mh (NATDEPFILES): Add linux-maps.o. * config/i386/linux64.mh (NATDEPFILES): Ditto. gdb/gdbserver/ChangeLog 2014-02-26 Aleksandar Ristovski Create empty common/linux-maps.[ch] and common/target-utils.[ch]. * Makefile.in (OBS): Add target-utils.o. (linux-maps.o, target-utils.o): New. * configure.srv (srv_linux_obj): Add linux-maps.o. --- gdb/Makefile.in | 14 +++++++++++--- gdb/common/linux-maps.c | 25 +++++++++++++++++++++++++ gdb/common/linux-maps.h | 22 ++++++++++++++++++++++ gdb/common/target-utils.c | 26 ++++++++++++++++++++++++++ gdb/common/target-utils.h | 23 +++++++++++++++++++++++ gdb/config/i386/linux.mh | 2 +- gdb/config/i386/linux64.mh | 2 +- gdb/gdbserver/Makefile.in | 8 +++++++- gdb/gdbserver/configure.srv | 2 +- 9 files changed, 117 insertions(+), 7 deletions(-) create mode 100644 gdb/common/linux-maps.c create mode 100644 gdb/common/linux-maps.h create mode 100644 gdb/common/target-utils.c create mode 100644 gdb/common/target-utils.h diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 95104ef..3b1d1d8 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -900,7 +900,7 @@ LINTFILES = $(SFILES) $(YYFILES) $(CONFIG_SRCS) init.c # right, it is probably easiest just to list .h files here directly. HFILES_NO_SRCDIR = \ -common/gdb_signals.h nat/gdb_thread_db.h common/gdb_vecs.h \ +common/gdb_signals.h nat/gdb_thread_db.h common/gdb_vecs.h common/linux-maps.h \ common/x86-xstate.h nat/linux-ptrace.h nat/mips-linux-watch.h \ proc-utils.h aarch64-tdep.h arm-tdep.h ax-gdb.h ppcfbsd-tdep.h \ ppcnbsd-tdep.h cli-out.h gdb_expat.h breakpoint.h infcall.h obsd-tdep.h \ @@ -979,7 +979,7 @@ i386-linux-nat.h common/common-defs.h common/errors.h common/common-types.h \ common/common-debug.h common/cleanups.h common/gdb_setjmp.h \ common/common-exceptions.h target/target.h common/symbol.h \ common/common-regcache.h fbsd-tdep.h nat/linux-personality.h \ -common/fileio.h nat/x86-linux.h nat/x86-linux-dregs.h +common/fileio.h nat/x86-linux.h nat/x86-linux-dregs.h common/target-utils.h # Header files that already have srcdir in them, or which are in objdir. @@ -1079,7 +1079,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \ 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 common-debug.o debug.o \ - common-exceptions.o btrace-common.o fileio.o \ + common-exceptions.o btrace-common.o fileio.o target-utils.o \ $(SUBDIR_GCC_COMPILE_OBS) TSOBS = inflow.o @@ -2217,6 +2217,10 @@ common-agent.o: $(srcdir)/common/agent.c $(COMPILE) $(srcdir)/common/agent.c $(POSTCOMPILE) +linux-maps.o: ${srcdir}/common/linux-maps.c + $(COMPILE) $(srcdir)/common/linux-maps.c + $(POSTCOMPILE) + vec.o: ${srcdir}/common/vec.c $(COMPILE) $(srcdir)/common/vec.c $(POSTCOMPILE) @@ -2233,6 +2237,10 @@ errors.o: ${srcdir}/common/errors.c $(COMPILE) $(srcdir)/common/errors.c $(POSTCOMPILE) +target-utils.o: ${srcdir}/common/target-utils.c + $(COMPILE) $(srcdir)/common/target-utils.c + $(POSTCOMPILE) + common-debug.o: ${srcdir}/common/common-debug.c $(COMPILE) $(srcdir)/common/common-debug.c $(POSTCOMPILE) diff --git a/gdb/common/linux-maps.c b/gdb/common/linux-maps.c new file mode 100644 index 0000000..bb3eac9 --- /dev/null +++ b/gdb/common/linux-maps.c @@ -0,0 +1,25 @@ +/* Linux-specific memory maps manipulation routines. + 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 . */ + +#ifdef GDBSERVER +#include "server.h" +#else +#include "defs.h" +#endif + +#include "linux-maps.h" diff --git a/gdb/common/linux-maps.h b/gdb/common/linux-maps.h new file mode 100644 index 0000000..ebf6f37 --- /dev/null +++ b/gdb/common/linux-maps.h @@ -0,0 +1,22 @@ +/* Linux-specific memory maps manipulation routines. + 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 . */ + +#ifndef COMMON_LINUX_MAPS_H +#define COMMON_LINUX_MAPS_H + +#endif /* COMMON_LINUX_MAPS_H */ diff --git a/gdb/common/target-utils.c b/gdb/common/target-utils.c new file mode 100644 index 0000000..308996d --- /dev/null +++ b/gdb/common/target-utils.c @@ -0,0 +1,26 @@ +/* Utility target functions for GDB, and GDBserver. + + 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 . */ + +#ifdef GDBSERVER +#include "server.h" +#else +#include "defs.h" +#endif + +#include "target-utils.h" diff --git a/gdb/common/target-utils.h b/gdb/common/target-utils.h new file mode 100644 index 0000000..db33ec8 --- /dev/null +++ b/gdb/common/target-utils.h @@ -0,0 +1,23 @@ +/* Utility target functions for GDB, and GDBserver. + + 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 . */ + +#ifndef COMMON_TARGET_UTILS_H +#define COMMON_TARGET_UTILS_H + +#endif /* COMMON_TARGET_UTILS_H */ diff --git a/gdb/config/i386/linux.mh b/gdb/config/i386/linux.mh index 9be2c5f..f650005 100644 --- a/gdb/config/i386/linux.mh +++ b/gdb/config/i386/linux.mh @@ -3,7 +3,7 @@ NAT_FILE= config/nm-linux.h NATDEPFILES= inf-ptrace.o fork-child.o \ x86-nat.o x86-dregs.o i386-linux-nat.o x86-linux-nat.o \ - proc-service.o linux-thread-db.o \ + proc-service.o linux-thread-db.o linux-maps.o \ linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o \ linux-btrace.o linux-waitpid.o linux-personality.o x86-linux.o \ x86-linux-dregs.o diff --git a/gdb/config/i386/linux64.mh b/gdb/config/i386/linux64.mh index 224a2a9..b71bda0 100644 --- a/gdb/config/i386/linux64.mh +++ b/gdb/config/i386/linux64.mh @@ -2,7 +2,7 @@ NATDEPFILES= inf-ptrace.o fork-child.o \ x86-nat.o x86-dregs.o amd64-nat.o amd64-linux-nat.o \ x86-linux-nat.o \ - linux-nat.o linux-osdata.o \ + linux-maps.o linux-nat.o linux-osdata.o \ proc-service.o linux-thread-db.o linux-fork.o \ linux-procfs.o linux-ptrace.o linux-btrace.o \ linux-waitpid.o linux-personality.o x86-linux.o \ diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index a981ee8..b4465e6 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -194,7 +194,7 @@ OBS = agent.o ax.o inferiors.o regcache.o remote-utils.o server.o signals.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 common-debug.o cleanups.o \ - common-exceptions.o symbol.o btrace-common.o fileio.o \ + common-exceptions.o symbol.o btrace-common.o fileio.o target-utils.o \ $(XML_BUILTIN) $(DEPFILES) $(LIBOBJS) GDBREPLAY_OBS = gdbreplay.o version.o GDBSERVER_LIBS = @GDBSERVER_LIBS@ @@ -519,6 +519,9 @@ ax.o: ax.c signals.o: ../common/signals.c $(COMPILE) $< $(POSTCOMPILE) +linux-maps.o: ../common/linux-maps.c + $(COMPILE) $< + $(POSTCOMPILE) print-utils.o: ../common/print-utils.c $(COMPILE) $< $(POSTCOMPILE) @@ -531,6 +534,9 @@ common-utils.o: ../common/common-utils.c posix-strerror.o: ../common/posix-strerror.c $(COMPILE) $< $(POSTCOMPILE) +target-utils.o: ../common/target-utils.c + $(COMPILE) $< + $(POSTCOMPILE) mingw-strerror.o: ../common/mingw-strerror.c $(COMPILE) $< $(POSTCOMPILE) diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv index 81dd235..3b3888d 100644 --- a/gdb/gdbserver/configure.srv +++ b/gdb/gdbserver/configure.srv @@ -42,7 +42,7 @@ srv_amd64_linux_xmlfiles="i386/amd64-linux.xml i386/amd64-avx-linux.xml i386/amd # Linux object files. This is so we don't have to repeat # these files over and over again. -srv_linux_obj="linux-low.o linux-osdata.o linux-procfs.o linux-ptrace.o linux-waitpid.o linux-personality.o" +srv_linux_obj="linux-low.o linux-osdata.o linux-procfs.o linux-maps.o linux-ptrace.o linux-waitpid.o linux-personality.o" # Input is taken from the "${target}" variable.