From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2678 invoked by alias); 12 Aug 2008 18:24:52 -0000 Received: (qmail 2669 invoked by uid 22791); 12 Aug 2008 18:24:52 -0000 X-Spam-Check-By: sourceware.org Received: from mtagate1.de.ibm.com (HELO mtagate1.de.ibm.com) (195.212.29.150) by sourceware.org (qpsmtpd/0.31) with ESMTP; Tue, 12 Aug 2008 18:24:07 +0000 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate1.de.ibm.com (8.13.8/8.13.8) with ESMTP id m7CINxWV235080 for ; Tue, 12 Aug 2008 18:23:59 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 v9.0) with ESMTP id m7CINwUi3342550 for ; Tue, 12 Aug 2008 20:23:58 +0200 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 m7CINwCn010173 for ; Tue, 12 Aug 2008 20:23:58 +0200 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with SMTP id m7CINwv1010170; Tue, 12 Aug 2008 20:23:58 +0200 Message-Id: <200808121823.m7CINwv1010170@d12av02.megacenter.de.ibm.com> Received: by tuxmaker.boeblingen.de.ibm.com (sSMTP sendmail emulation); Tue, 12 Aug 2008 20:23:58 +0200 Subject: [commit] Fix broken watchpoints (Re: [patch-ppc] Hardware watchpoint support for 44x/BookE-based systems) To: luisgpm@linux.vnet.ibm.com Date: Tue, 12 Aug 2008 18:24:00 -0000 From: "Ulrich Weigand" Cc: gdb-patches@sourceware.org In-Reply-To: <1217966200.19330.40.camel@gargoyle> from "Luis Machado" at Aug 05, 2008 04:56:39 PM X-Mailer: ELM [version 2.5 PL2] MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit 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-08/txt/msg00321.txt.bz2 Luis Machado wrote: > * ppc-linux-nat.c: Include "auxv.h" and "elf/common.h". > Define PPC_FEATURE_BOOKE. > (ppc_linux_get_hwcap): New function. > (ppc_linux_region_ok_for_hw_watchpoint): Handle PowerPC 440 > 4-bytes alignment restrictions. > (ppc_linux_insert_watchpoint): Handle PowerPC 440-specific > positioning of the read/write flags. > (ppc_linux_watchpoint_addr_within_range): Handle PowerPC 440 > 4-bytes alignment. unfortunately this patch completely broke watchpoint support for me on Cell. The reason is that this routine: >+/* Fetch the AT_HWCAP entry from the aux vector. */ >+unsigned long ppc_linux_get_hwcap (void) >+{ >+ CORE_ADDR field; >+ >+ if (target_auxv_search (¤t_target, AT_PLATFORM, &field)) >+ return (unsigned long) field; really needs to fetch AT_HWCAP, *not* AT_PLATFORM (which is a string). Fixed by the patch below. Tested on powerpc-linux and powerpc64-linux (on Cell/B.E.), checked into mainline. Bye, Ulrich ChangeLog: * ppc-linux-nat.c (ppc_linux_get_hwcap): Really get AT_HWCAP. diff -urNp gdb-orig/gdb/ppc-linux-nat.c gdb-head/gdb/ppc-linux-nat.c --- gdb-orig/gdb/ppc-linux-nat.c 2008-08-12 19:13:15.793562000 +0200 +++ gdb-head/gdb/ppc-linux-nat.c 2008-08-12 19:49:17.363981345 +0200 @@ -835,7 +835,7 @@ unsigned long ppc_linux_get_hwcap (void) { CORE_ADDR field; - if (target_auxv_search (¤t_target, AT_PLATFORM, &field)) + if (target_auxv_search (¤t_target, AT_HWCAP, &field)) return (unsigned long) field; return 0; -- Dr. Ulrich Weigand GNU Toolchain for Linux on System z and Cell BE Ulrich.Weigand@de.ibm.com