From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19124 invoked by alias); 16 Apr 2009 15:27:30 -0000 Received: (qmail 19114 invoked by uid 22791); 16 Apr 2009 15:27:27 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from mail-out.m-online.net (HELO mail-out.m-online.net) (212.18.0.10) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 16 Apr 2009 15:27:21 +0000 Received: from mail01.m-online.net (mail.m-online.net [192.168.3.149]) by mail-out.m-online.net (Postfix) with ESMTP id EF1151C00066 for ; Thu, 16 Apr 2009 17:27:16 +0200 (CEST) Received: from localhost (dynscan2.mnet-online.de [192.168.1.215]) by mail.m-online.net (Postfix) with ESMTP id 2F29290018 for ; Thu, 16 Apr 2009 17:27:19 +0200 (CEST) Received: from mail.mnet-online.de ([192.168.3.149]) by localhost (dynscan2.mnet-online.de [192.168.1.215]) (amavisd-new, port 10024) with ESMTP id Z5MiX7NHYeAd for ; Thu, 16 Apr 2009 17:27:18 +0200 (CEST) Received: from igel.home (DSL01.83.171.182.115.ip-pool.NEFkom.net [83.171.182.115]) by mail.mnet-online.de (Postfix) with ESMTP for ; Thu, 16 Apr 2009 17:27:17 +0200 (CEST) Received: by igel.home (Postfix, from userid 501) id CA8A010D9EE; Thu, 16 Apr 2009 17:27:16 +0200 (CEST) From: Andreas Schwab To: gdb-patches@sourceware.org Subject: m68klinux-nat: Remove obsolete comment X-Yow: Everywhere I look I see NEGATIVITY and ASPHALT... Date: Thu, 16 Apr 2009 15:27:00 -0000 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.92 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2009-04/txt/msg00365.txt.bz2 As noted by Joel, the comment is obsolete now that FETCH_INFERIOR_REGISTERS does not exist any more. I took the opportunity to simplify fetch_register and store_register a bit. Andreas. 2009-04-16 Andreas Schwab * m68klinux-nat.c: Remove obsolete comment. (fetch_register, store_register): Don't call gdbarch_cannot_fetch_register or gdbarch_cannot_store_register, which are always nops here. --- m68klinux-nat.c.~1.49.~ 2009-02-27 15:49:17.000000000 +0100 +++ m68klinux-nat.c 2009-04-16 17:12:42.000000000 +0200 @@ -95,59 +95,32 @@ int have_ptrace_getregs = /* Fetching registers directly from the U area, one at a time. */ -/* FIXME: This duplicates code from `inptrace.c'. The problem is that we - define FETCH_INFERIOR_REGISTERS since we want to use our own versions - of {fetch,store}_inferior_registers that use the GETREGS request. This - means that the code in `infptrace.c' is #ifdef'd out. But we need to - fall back on that code when GDB is running on top of a kernel that - doesn't support the GETREGS request. */ - -#ifndef PT_READ_U -#define PT_READ_U PTRACE_PEEKUSR -#endif -#ifndef PT_WRITE_U -#define PT_WRITE_U PTRACE_POKEUSR -#endif - /* Fetch one register. */ static void fetch_register (struct regcache *regcache, int regno) { struct gdbarch *gdbarch = get_regcache_arch (regcache); - /* This isn't really an address. But ptrace thinks of it as one. */ - CORE_ADDR regaddr; - char mess[128]; /* For messages */ + long regaddr; int i; char buf[MAX_REGISTER_SIZE]; int tid; - if (gdbarch_cannot_fetch_register (gdbarch, regno)) - { - memset (buf, '\0', register_size (gdbarch, regno)); /* Supply zeroes */ - regcache_raw_supply (regcache, regno, buf); - return; - } - /* Overload thread id onto process id */ tid = TIDGET (inferior_ptid); if (tid == 0) tid = PIDGET (inferior_ptid); /* no thread id, just use process id */ regaddr = 4 * regmap[regno]; - for (i = 0; i < register_size (gdbarch, regno); - i += sizeof (PTRACE_TYPE_RET)) + for (i = 0; i < register_size (gdbarch, regno); i += sizeof (long)) { errno = 0; - *(PTRACE_TYPE_RET *) &buf[i] = ptrace (PT_READ_U, tid, - (PTRACE_TYPE_ARG3) regaddr, 0); - regaddr += sizeof (PTRACE_TYPE_RET); + *(long *) &buf[i] = ptrace (PTRACE_PEEKUSER, tid, regaddr, 0); + regaddr += sizeof (long); if (errno != 0) - { - sprintf (mess, "reading register %s (#%d)", - gdbarch_register_name (gdbarch, regno), regno); - perror_with_name (mess); - } + error (_("Couldn't read register %s (#%d): %s."), + gdbarch_register_name (gdbarch, regno), + regno, safe_strerror (errno)); } regcache_raw_supply (regcache, regno, buf); } @@ -180,16 +153,11 @@ static void store_register (const struct regcache *regcache, int regno) { struct gdbarch *gdbarch = get_regcache_arch (regcache); - /* This isn't really an address. But ptrace thinks of it as one. */ - CORE_ADDR regaddr; - char mess[128]; /* For messages */ + long regaddr; int i; int tid; char buf[MAX_REGISTER_SIZE]; - if (gdbarch_cannot_store_register (gdbarch, regno)) - return; - /* Overload thread id onto process id */ tid = TIDGET (inferior_ptid); if (tid == 0) @@ -201,19 +169,15 @@ store_register (const struct regcache *r regcache_raw_collect (regcache, regno, buf); /* Store the local buffer into the inferior a chunk at the time. */ - for (i = 0; i < register_size (gdbarch, regno); - i += sizeof (PTRACE_TYPE_RET)) + for (i = 0; i < register_size (gdbarch, regno); i += sizeof (long)) { errno = 0; - ptrace (PT_WRITE_U, tid, (PTRACE_TYPE_ARG3) regaddr, - *(PTRACE_TYPE_RET *) (buf + i)); - regaddr += sizeof (PTRACE_TYPE_RET); + ptrace (PTRACE_POKEUSER, tid, regaddr, *(long *) &buf[i]); + regaddr += sizeof (long); if (errno != 0) - { - sprintf (mess, "writing register %s (#%d)", - gdbarch_register_name (gdbarch, regno), regno); - perror_with_name (mess); - } + error (_("Couldn't write register %s (#%d): %s."), + gdbarch_register_name (gdbarch, regno), + regno, safe_strerror (errno)); } } -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."