From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21549 invoked by alias); 15 Jan 2008 11:07:00 -0000 Received: (qmail 21536 invoked by uid 22791); 15 Jan 2008 11:06:59 -0000 X-Spam-Check-By: sourceware.org Received: from mtagate2.de.ibm.com (HELO mtagate2.de.ibm.com) (195.212.29.151) by sourceware.org (qpsmtpd/0.31) with ESMTP; Tue, 15 Jan 2008 11:06:33 +0000 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate2.de.ibm.com (8.13.8/8.13.8) with ESMTP id m0FB6Vjw143022 for ; Tue, 15 Jan 2008 11:06:31 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v8.7) with ESMTP id m0FB6U5t2723870 for ; Tue, 15 Jan 2008 12:06:31 +0100 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id m0FB6U3a005741 for ; Tue, 15 Jan 2008 12:06:30 +0100 Received: from bbkeks.de.ibm.com (dyn-9-152-248-46.boeblingen.de.ibm.com [9.152.248.46]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id m0FB6Rsa005675 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 15 Jan 2008 12:06:30 +0100 Message-ID: <478C9344.60604@de.ibm.com> Date: Tue, 15 Jan 2008 11:07:00 -0000 From: Markus Deuling User-Agent: Thunderbird 2.0.0.9 (X11/20071031) MIME-Version: 1.0 To: GDB Patches CC: Ulrich Weigand Subject: [patch] Get rid of current_gdbarch in ppc-linux-nat.c Content-Type: multipart/mixed; boundary="------------090906080609060406060209" 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: 2008-01/txt/msg00345.txt.bz2 This is a multi-part message in MIME format. --------------090906080609060406060209 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Content-length: 352 Hi, this patch removes the last occurence of current_gdbarch in ppc-linux-nat.c Tested on PowerPC without regression. Ok to commit ? ChangeLog: * ppc-linux-nat.c (ppc_register_u_addr): Add gdbarch as parameter. Replace current_gdbarch by gdbarch. Update caller. -- Markus Deuling GNU Toolchain for Linux on Cell BE deuling@de.ibm.com --------------090906080609060406060209 Content-Type: text/plain; name="diff-ppc" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diff-ppc" Content-length: 1997 diff -urpN src/gdb/ppc-linux-nat.c dev/gdb/ppc-linux-nat.c --- src/gdb/ppc-linux-nat.c 2008-01-11 15:42:53.000000000 +0100 +++ dev/gdb/ppc-linux-nat.c 2008-01-15 11:27:21.000000000 +0100 @@ -162,10 +162,10 @@ PT_NIP, PT_MSR, PT_CCR, PT_LNK, PT_CTR, /* *INDENT_ON * */ static int -ppc_register_u_addr (int regno) +ppc_register_u_addr (struct gdbarch *gdbarch, int regno) { int u_addr = -1; - struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); /* NOTE: cagney/2003-11-25: This is the word size used by the ptrace interface, and not the wordsize of the program's ABI. */ int wordsize = sizeof (long); @@ -184,7 +184,7 @@ ppc_register_u_addr (int regno) u_addr = (PT_FPR0 * wordsize) + ((regno - tdep->ppc_fp0_regnum) * 8); /* UISA special purpose registers: 1 slot each */ - if (regno == gdbarch_pc_regnum (current_gdbarch)) + if (regno == gdbarch_pc_regnum (gdbarch)) u_addr = PT_NIP * wordsize; if (regno == tdep->ppc_lr_regnum) u_addr = PT_LNK * wordsize; @@ -332,7 +332,7 @@ fetch_register (struct regcache *regcach struct gdbarch *gdbarch = get_regcache_arch (regcache); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); /* This isn't really an address. But ptrace thinks of it as one. */ - CORE_ADDR regaddr = ppc_register_u_addr (regno); + CORE_ADDR regaddr = ppc_register_u_addr (gdbarch, regno); int bytes_transferred; unsigned int offset; /* Offset of registers within the u area. */ char buf[MAX_REGISTER_SIZE]; @@ -632,7 +632,7 @@ store_register (const struct regcache *r struct gdbarch *gdbarch = get_regcache_arch (regcache); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); /* This isn't really an address. But ptrace thinks of it as one. */ - CORE_ADDR regaddr = ppc_register_u_addr (regno); + CORE_ADDR regaddr = ppc_register_u_addr (gdbarch, regno); int i; size_t bytes_to_transfer; char buf[MAX_REGISTER_SIZE]; --------------090906080609060406060209--