From patchwork Thu Apr 30 00:25:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sandra Loosemore X-Patchwork-Id: 6495 Received: (qmail 99261 invoked by alias); 30 Apr 2015 00:26: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 99234 invoked by uid 89); 30 Apr 2015 00:26:38 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 30 Apr 2015 00:26:37 +0000 Received: from svr-orw-fem-03.mgc.mentorg.com ([147.34.97.39]) by relay1.mentorg.com with esmtp id 1YncJG-0001tC-3g from Sandra_Loosemore@mentor.com ; Wed, 29 Apr 2015 17:26:34 -0700 Received: from [IPv6:::1] (147.34.91.1) by svr-orw-fem-03.mgc.mentorg.com (147.34.97.39) with Microsoft SMTP Server id 14.3.224.2; Wed, 29 Apr 2015 17:26:33 -0700 Message-ID: <5541767C.1010408@codesourcery.com> Date: Wed, 29 Apr 2015 18:25:32 -0600 From: Sandra Loosemore User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130329 Thunderbird/17.0.5 MIME-Version: 1.0 To: , Yao Qi Subject: [patch v2 2/5, nios2] use PTRACE_GETREGSET/SETREGSET in gdbserver References: <554172F8.2020108@codesourcery.com> In-Reply-To: <554172F8.2020108@codesourcery.com> This patch is unchanged since the original version posted here: https://sourceware.org/ml/gdb-patches/2015-04/msg00906.html but I made the requested change to the ChangeLog. OK to commit now? -Sandra diff --git a/gdb/gdbserver/linux-nios2-low.c b/gdb/gdbserver/linux-nios2-low.c index e2fbb89..7bd3c97 100644 --- a/gdb/gdbserver/linux-nios2-low.c +++ b/gdb/gdbserver/linux-nios2-low.c @@ -21,6 +21,7 @@ #include "server.h" #include "linux-low.h" +#include "elf/common.h" #include #include #include "gdb_proc_service.h" @@ -32,7 +33,7 @@ /* The following definition must agree with the number of registers defined in "struct user_regs" in GLIBC - (ports/sysdeps/unix/sysv/linux/nios2/sys/user.h), and also with + (sysdeps/unix/sysv/linux/nios2/sys/user.h), and also with NIOS2_NUM_REGS in GDB proper. */ #define nios2_num_regs 49 @@ -163,8 +164,6 @@ ps_get_thread_area (const struct ps_prochandle *ph, return PS_OK; } -#ifdef HAVE_PTRACE_GETREGS - /* Helper functions to collect/supply a single register REGNO. */ static void @@ -205,14 +204,12 @@ nios2_store_gregset (struct regcache *regcache, const void *buf) for (i = 0; i < nios2_num_regs; i++) nios2_supply_register (regcache, i, regset + i); } -#endif /* HAVE_PTRACE_GETREGS */ static struct regset_info nios2_regsets[] = { -#ifdef HAVE_PTRACE_GETREGS - { PTRACE_GETREGS, PTRACE_SETREGS, 0, nios2_num_regs * 4, GENERAL_REGS, + { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS, + nios2_num_regs * 4, GENERAL_REGS, nios2_fill_gregset, nios2_store_gregset }, -#endif /* HAVE_PTRACE_GETREGS */ { 0, 0, 0, -1, -1, NULL, NULL } };