From patchwork Thu May 28 14:20:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 6954 Received: (qmail 106280 invoked by alias); 28 May 2015 14:20:40 -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 106183 invoked by uid 89); 28 May 2015 14:20:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.8 required=5.0 tests=AWL, BAYES_20, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-pd0-f178.google.com Received: from mail-pd0-f178.google.com (HELO mail-pd0-f178.google.com) (209.85.192.178) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Thu, 28 May 2015 14:20:25 +0000 Received: by pdbki1 with SMTP id ki1so42932662pdb.1 for ; Thu, 28 May 2015 07:20:23 -0700 (PDT) X-Received: by 10.70.129.106 with SMTP id nv10mr6021333pdb.160.1432822823361; Thu, 28 May 2015 07:20:23 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com (gcc1-power7.osuosl.org. [140.211.15.137]) by mx.google.com with ESMTPSA id dd3sm2587101pad.45.2015.05.28.07.20.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 May 2015 07:20:22 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 1/6] Move PTRACE_GETREGSET and PTRACE_SETREGSET to nat/linux-ptrace.h Date: Thu, 28 May 2015 15:20:11 +0100 Message-Id: <1432822816-32327-2-git-send-email-yao.qi@linaro.org> In-Reply-To: <1432822816-32327-1-git-send-email-yao.qi@linaro.org> References: <1432822816-32327-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes Macros PTRACE_GETREGSET and PTRACE_SETREGSET are defined locally in some places in GDB and GDBserver. This patch is to move them to nat/linux-ptrace.h to avoid duplication. gdb: 2015-05-28 Yao Qi * amd64-linux-nat.c: Include "nat/linux-ptrace.h". * i386-linux-nat.c: Likewise. * nat/linux-ptrace.h (PTRACE_GETREGSET, PTRACE_SETREGSET): Define. * s390-linux-nat.c: Include "nat/linux-ptrace.h". (PTRACE_GETREGSET, PTRACE_SETREGSET): Remove. * x86-linux-nat.c: Include "nat/linux-ptrace.h". * x86-linux-nat.h (PTRACE_GETREGSET, PTRACE_SETREGSET): Remove. gdb/gdbserver: 2015-05-28 Yao Qi * linux-s390-low.c (PTRACE_GETREGSET, PTRACE_SETREGSET): Remove. * linux-x86-low.c: Likewise. --- gdb/amd64-linux-nat.c | 1 + gdb/gdbserver/linux-s390-low.c | 8 -------- gdb/gdbserver/linux-x86-low.c | 9 --------- gdb/i386-linux-nat.c | 1 + gdb/nat/linux-ptrace.h | 8 ++++++++ gdb/s390-linux-nat.c | 9 +-------- gdb/x86-linux-nat.c | 1 + gdb/x86-linux-nat.h | 8 -------- 8 files changed, 12 insertions(+), 33 deletions(-) diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c index 22a1359..30892ca 100644 --- a/gdb/amd64-linux-nat.c +++ b/gdb/amd64-linux-nat.c @@ -37,6 +37,7 @@ #include "x86-xstate.h" #include "x86-linux-nat.h" +#include "nat/linux-ptrace.h" /* Mapping between the general-purpose registers in GNU/Linux x86-64 `struct user' format and GDB's register cache layout for GNU/Linux diff --git a/gdb/gdbserver/linux-s390-low.c b/gdb/gdbserver/linux-s390-low.c index afee1ff..5d4ea1f 100644 --- a/gdb/gdbserver/linux-s390-low.c +++ b/gdb/gdbserver/linux-s390-low.c @@ -40,14 +40,6 @@ #define HWCAP_S390_VX 2048 #endif -#ifndef PTRACE_GETREGSET -#define PTRACE_GETREGSET 0x4204 -#endif - -#ifndef PTRACE_SETREGSET -#define PTRACE_SETREGSET 0x4205 -#endif - /* Defined in auto-generated file s390-linux32.c. */ void init_registers_s390_linux32 (void); extern const struct target_desc *tdesc_s390_linux32; diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c index 4aef7b7..484eadb 100644 --- a/gdb/gdbserver/linux-x86-low.c +++ b/gdb/gdbserver/linux-x86-low.c @@ -120,15 +120,6 @@ static const char *xmltarget_amd64_linux_no_xml = "@\ #include #include -#ifndef PTRACE_GETREGSET -#define PTRACE_GETREGSET 0x4204 -#endif - -#ifndef PTRACE_SETREGSET -#define PTRACE_SETREGSET 0x4205 -#endif - - #ifndef PTRACE_GET_THREAD_AREA #define PTRACE_GET_THREAD_AREA 25 #endif diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c index 8cb8c66..5666361 100644 --- a/gdb/i386-linux-nat.c +++ b/gdb/i386-linux-nat.c @@ -34,6 +34,7 @@ #include "x86-xstate.h" #include "x86-linux-nat.h" +#include "nat/linux-ptrace.h" /* The register sets used in GNU/Linux ELF core-dumps are identical to the register sets in `struct user' that is used for a.out diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h index 1db0cde..be6c395 100644 --- a/gdb/nat/linux-ptrace.h +++ b/gdb/nat/linux-ptrace.h @@ -43,6 +43,14 @@ struct buffer; # define PTRACE_SETSIGINFO 0x4203 #endif /* PTRACE_GETSIGINF */ +#ifndef PTRACE_GETREGSET +#define PTRACE_GETREGSET 0x4204 +#endif + +#ifndef PTRACE_SETREGSET +#define PTRACE_SETREGSET 0x4205 +#endif + /* If the system headers did not provide the constants, hard-code the normal values. */ #ifndef PTRACE_EVENT_FORK diff --git a/gdb/s390-linux-nat.c b/gdb/s390-linux-nat.c index 4cd3192..cedc505 100644 --- a/gdb/s390-linux-nat.c +++ b/gdb/s390-linux-nat.c @@ -27,6 +27,7 @@ #include "auxv.h" #include "gregset.h" #include "regset.h" +#include "nat/linux-ptrace.h" #include "s390-linux-tdep.h" #include "elf/common.h" @@ -38,14 +39,6 @@ #include #include -#ifndef PTRACE_GETREGSET -#define PTRACE_GETREGSET 0x4204 -#endif - -#ifndef PTRACE_SETREGSET -#define PTRACE_SETREGSET 0x4205 -#endif - /* Per-thread arch-specific data. */ struct arch_lwp_info diff --git a/gdb/x86-linux-nat.c b/gdb/x86-linux-nat.c index f8eb236..0026d26 100644 --- a/gdb/x86-linux-nat.c +++ b/gdb/x86-linux-nat.c @@ -41,6 +41,7 @@ #include "nat/linux-nat.h" #include "nat/x86-linux.h" #include "nat/x86-linux-dregs.h" +#include "nat/linux-ptrace.h" /* Per-thread arch-specific data we want to keep. */ diff --git a/gdb/x86-linux-nat.h b/gdb/x86-linux-nat.h index 7928aa0..7c4d87c 100644 --- a/gdb/x86-linux-nat.h +++ b/gdb/x86-linux-nat.h @@ -20,14 +20,6 @@ #ifndef X86_LINUX_NAT_H #define X86_LINUX_NAT_H 1 -#ifndef PTRACE_GETREGSET -#define PTRACE_GETREGSET 0x4204 -#endif - -#ifndef PTRACE_SETREGSET -#define PTRACE_SETREGSET 0x4205 -#endif - /* Does the current host support PTRACE_GETREGSET? */ extern int have_ptrace_getregset;