From patchwork Fri Jun 27 09:10:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 1783 Received: (qmail 29044 invoked by alias); 27 Jun 2014 09:10:29 -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 28792 invoked by uid 89); 27 Jun 2014 09:10:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham 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; Fri, 27 Jun 2014 09:10:25 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5R9AOZ1003734 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 27 Jun 2014 05:10:24 -0400 Received: from blade.nx (ovpn-116-77.ams2.redhat.com [10.36.116.77]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s5R9AM05009724 for ; Fri, 27 Jun 2014 05:10:23 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id 7C2492640BD for ; Fri, 27 Jun 2014 10:10:21 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Subject: [PATCH 2/7] Merge {i386,amd64}_linux_read_description Date: Fri, 27 Jun 2014 10:10:04 +0100 Message-Id: <1403860209-475-3-git-send-email-gbenson@redhat.com> In-Reply-To: <1403860209-475-1-git-send-email-gbenson@redhat.com> References: <1403860209-475-1-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes This commit merges i386_ and amd64_linux_read_description, renaming both to x86_linux_read_description. gdb/ 2014-06-27 Gary Benson * amd64-linux-nat.c (amd64_linux_read_description): Renamed to x86_linux_read_description. All uses updated. amd64-specific code conditionalized. Conditionalized i386-specific code added. Redundant cast removed. * i386-linux-nat.c (i386_linux_read_description): Renamed to x86_linux_read_description. All uses updated. i386-specific code conditionalized. Conditionalized amd64-specific code added. One sizeof replaced with the actual type it is describing. --- gdb/ChangeLog | 11 ++++ gdb/amd64-linux-nat.c | 101 ++++++++++++++++++++++++++-------------- gdb/i386-linux-nat.c | 122 +++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 184 insertions(+), 50 deletions(-) diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c index d8e424a..952905c 100644 --- a/gdb/amd64-linux-nat.c +++ b/gdb/amd64-linux-nat.c @@ -1034,28 +1034,28 @@ amd64_linux_siginfo_fixup (siginfo_t *native, gdb_byte *inf, int direction) return 0; } -/* Get Linux/x86 target description from running target. - - Value of CS segment register: - 1. 64bit process: 0x33. - 2. 32bit process: 0x23. - - Value of DS segment register: - 1. LP64 process: 0x0. - 2. X32 process: 0x2b. - */ +#ifdef __x86_64__ +/* Value of CS segment register: + 64bit process: 0x33 + 32bit process: 0x23 */ +#define AMD64_LINUX_USER64_CS 0x33 + +/* Value of DS segment register: + LP64 process: 0x0 + X32 process: 0x2b */ +#define AMD64_LINUX_X32_DS 0x2b +#endif -#define AMD64_LINUX_USER64_CS 0x33 -#define AMD64_LINUX_X32_DS 0x2b +/* Get Linux/x86 target description from running target. */ static const struct target_desc * -amd64_linux_read_description (struct target_ops *ops) +x86_linux_read_description (struct target_ops *ops) { - unsigned long cs; - unsigned long ds; int tid; +#ifdef __x86_64__ int is_64bit; int is_x32; +#endif static uint64_t xcr0; /* GNU/Linux LWP ID's are process ID's. */ @@ -1063,26 +1063,45 @@ amd64_linux_read_description (struct target_ops *ops) if (tid == 0) tid = ptid_get_pid (inferior_ptid); /* Not a threaded program. */ - /* Get CS register. */ - errno = 0; - cs = ptrace (PTRACE_PEEKUSER, tid, - offsetof (struct user_regs_struct, cs), 0); - if (errno != 0) - perror_with_name (_("Couldn't get CS register")); - - is_64bit = cs == AMD64_LINUX_USER64_CS; - - /* Get DS register. */ - errno = 0; - ds = ptrace (PTRACE_PEEKUSER, tid, - offsetof (struct user_regs_struct, ds), 0); - if (errno != 0) - perror_with_name (_("Couldn't get DS register")); - - is_x32 = ds == AMD64_LINUX_X32_DS; +#ifdef __x86_64__ + { + unsigned long cs; + unsigned long ds; + + /* Get CS register. */ + errno = 0; + cs = ptrace (PTRACE_PEEKUSER, tid, + offsetof (struct user_regs_struct, cs), 0); + if (errno != 0) + perror_with_name (_("Couldn't get CS register")); + + is_64bit = cs == AMD64_LINUX_USER64_CS; + + /* Get DS register. */ + errno = 0; + ds = ptrace (PTRACE_PEEKUSER, tid, + offsetof (struct user_regs_struct, ds), 0); + if (errno != 0) + perror_with_name (_("Couldn't get DS register")); + + is_x32 = ds == AMD64_LINUX_X32_DS; + + if (sizeof (void *) == 4 && is_64bit && !is_x32) + error (_("Can't debug 64-bit process with 32-bit GDB")); + } +#elif HAVE_PTRACE_GETFPXREGS + if (have_ptrace_getfpxregs == -1) + { + elf_fpxregset_t fpxregs; - if (sizeof (void *) == 4 && is_64bit && !is_x32) - error (_("Can't debug 64-bit process with 32-bit GDB")); + if (ptrace (PTRACE_GETFPXREGS, tid, 0, (int) &fpxregs) < 0) + { + have_ptrace_getfpxregs = 0; + have_ptrace_getregset = 0; + return tdesc_i386_mmx_linux; + } + } +#endif if (have_ptrace_getregset == -1) { @@ -1094,7 +1113,7 @@ amd64_linux_read_description (struct target_ops *ops) /* Check if PTRACE_GETREGSET works. */ if (ptrace (PTRACE_GETREGSET, tid, - (unsigned int) NT_X86_XSTATE, (long) &iov) < 0) + (unsigned int) NT_X86_XSTATE, &iov) < 0) have_ptrace_getregset = 0; else { @@ -1113,6 +1132,7 @@ amd64_linux_read_description (struct target_ops *ops) { case I386_XSTATE_MPX_AVX512_MASK: case I386_XSTATE_AVX512_MASK: +#ifdef __x86_64__ if (is_64bit) { if (is_x32) @@ -1121,8 +1141,10 @@ amd64_linux_read_description (struct target_ops *ops) return tdesc_amd64_avx512_linux; } else +#endif return tdesc_i386_avx512_linux; case I386_XSTATE_MPX_MASK: +#ifdef __x86_64__ if (is_64bit) { if (is_x32) @@ -1131,8 +1153,10 @@ amd64_linux_read_description (struct target_ops *ops) return tdesc_amd64_mpx_linux; } else +#endif return tdesc_i386_mpx_linux; case I386_XSTATE_AVX_MASK: +#ifdef __x86_64__ if (is_64bit) { if (is_x32) @@ -1141,8 +1165,10 @@ amd64_linux_read_description (struct target_ops *ops) return tdesc_amd64_avx_linux; } else +#endif return tdesc_i386_avx_linux; default: +#ifdef __x86_64__ if (is_64bit) { if (is_x32) @@ -1151,11 +1177,13 @@ amd64_linux_read_description (struct target_ops *ops) return tdesc_amd64_linux; } else +#endif return tdesc_i386_linux; } } else { +#ifdef __x86_64__ if (is_64bit) { if (is_x32) @@ -1164,6 +1192,7 @@ amd64_linux_read_description (struct target_ops *ops) return tdesc_amd64_linux; } else +#endif return tdesc_i386_linux; } } @@ -1257,7 +1286,7 @@ _initialize_amd64_linux_nat (void) t->to_fetch_registers = amd64_linux_fetch_inferior_registers; t->to_store_registers = amd64_linux_store_inferior_registers; - t->to_read_description = amd64_linux_read_description; + t->to_read_description = x86_linux_read_description; /* Add btrace methods. */ t->to_supports_btrace = linux_supports_btrace; diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c index 24f9407..232fc05 100644 --- a/gdb/i386-linux-nat.c +++ b/gdb/i386-linux-nat.c @@ -995,12 +995,28 @@ x86_linux_child_post_startup_inferior (struct target_ops *self, ptid_t ptid) super_post_startup_inferior (self, ptid); } +#ifdef __x86_64__ +/* Value of CS segment register: + 64bit process: 0x33 + 32bit process: 0x23 */ +#define AMD64_LINUX_USER64_CS 0x33 + +/* Value of DS segment register: + LP64 process: 0x0 + X32 process: 0x2b */ +#define AMD64_LINUX_X32_DS 0x2b +#endif + /* Get Linux/x86 target description from running target. */ static const struct target_desc * -i386_linux_read_description (struct target_ops *ops) +x86_linux_read_description (struct target_ops *ops) { int tid; +#ifdef __x86_64__ + int is_64bit; + int is_x32; +#endif static uint64_t xcr0; /* GNU/Linux LWP ID's are process ID's. */ @@ -1008,7 +1024,33 @@ i386_linux_read_description (struct target_ops *ops) if (tid == 0) tid = ptid_get_pid (inferior_ptid); /* Not a threaded program. */ -#ifdef HAVE_PTRACE_GETFPXREGS +#ifdef __x86_64__ + { + unsigned long cs; + unsigned long ds; + + /* Get CS register. */ + errno = 0; + cs = ptrace (PTRACE_PEEKUSER, tid, + offsetof (struct user_regs_struct, cs), 0); + if (errno != 0) + perror_with_name (_("Couldn't get CS register")); + + is_64bit = cs == AMD64_LINUX_USER64_CS; + + /* Get DS register. */ + errno = 0; + ds = ptrace (PTRACE_PEEKUSER, tid, + offsetof (struct user_regs_struct, ds), 0); + if (errno != 0) + perror_with_name (_("Couldn't get DS register")); + + is_x32 = ds == AMD64_LINUX_X32_DS; + + if (sizeof (void *) == 4 && is_64bit && !is_x32) + error (_("Can't debug 64-bit process with 32-bit GDB")); + } +#elif HAVE_PTRACE_GETFPXREGS if (have_ptrace_getfpxregs == -1) { elf_fpxregset_t fpxregs; @@ -1031,8 +1073,8 @@ i386_linux_read_description (struct target_ops *ops) iov.iov_len = sizeof (xstateregs); /* Check if PTRACE_GETREGSET works. */ - if (ptrace (PTRACE_GETREGSET, tid, (unsigned int) NT_X86_XSTATE, - &iov) < 0) + if (ptrace (PTRACE_GETREGSET, tid, + (unsigned int) NT_X86_XSTATE, &iov) < 0) have_ptrace_getregset = 0; else { @@ -1040,28 +1082,80 @@ i386_linux_read_description (struct target_ops *ops) /* Get XCR0 from XSAVE extended state. */ xcr0 = xstateregs[(I386_LINUX_XSAVE_XCR0_OFFSET - / sizeof (long long))]; + / sizeof (uint64_t))]; } } /* Check the native XCR0 only if PTRACE_GETREGSET is available. */ - if (have_ptrace_getregset) + if (have_ptrace_getregset && (xcr0 & I386_XSTATE_ALL_MASK)) { - switch ((xcr0 & I386_XSTATE_ALL_MASK)) + switch (xcr0 & I386_XSTATE_ALL_MASK) { - case I386_XSTATE_MPX_AVX512_MASK: - case I386_XSTATE_AVX512_MASK: + case I386_XSTATE_MPX_AVX512_MASK: + case I386_XSTATE_AVX512_MASK: +#ifdef __x86_64__ + if (is_64bit) + { + if (is_x32) + return tdesc_x32_avx512_linux; + else + return tdesc_amd64_avx512_linux; + } + else +#endif return tdesc_i386_avx512_linux; case I386_XSTATE_MPX_MASK: - return tdesc_i386_mpx_linux; +#ifdef __x86_64__ + if (is_64bit) + { + if (is_x32) + return tdesc_x32_avx_linux; /* No MPX on x32 using AVX. */ + else + return tdesc_amd64_mpx_linux; + } + else +#endif + return tdesc_i386_mpx_linux; case I386_XSTATE_AVX_MASK: - return tdesc_i386_avx_linux; +#ifdef __x86_64__ + if (is_64bit) + { + if (is_x32) + return tdesc_x32_avx_linux; + else + return tdesc_amd64_avx_linux; + } + else +#endif + return tdesc_i386_avx_linux; default: - return tdesc_i386_linux; +#ifdef __x86_64__ + if (is_64bit) + { + if (is_x32) + return tdesc_x32_linux; + else + return tdesc_amd64_linux; + } + else +#endif + return tdesc_i386_linux; } } else - return tdesc_i386_linux; + { +#ifdef __x86_64__ + if (is_64bit) + { + if (is_x32) + return tdesc_x32_linux; + else + return tdesc_amd64_linux; + } + else +#endif + return tdesc_i386_linux; + } } /* Enable branch tracing. */ @@ -1148,7 +1242,7 @@ _initialize_i386_linux_nat (void) t->to_fetch_registers = i386_linux_fetch_inferior_registers; t->to_store_registers = i386_linux_store_inferior_registers; - t->to_read_description = i386_linux_read_description; + t->to_read_description = x86_linux_read_description; /* Add btrace methods. */ t->to_supports_btrace = linux_supports_btrace;