From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9098 invoked by alias); 7 Feb 2013 15:51:39 -0000 Received: (qmail 9076 invoked by uid 22791); 7 Feb 2013 15:51:37 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_SPAMHAUS_DROP,RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from service87.mimecast.com (HELO service87.mimecast.com) (91.220.42.44) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 07 Feb 2013 15:51:31 +0000 Received: from cam-owa2.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Thu, 07 Feb 2013 15:51:28 +0000 Received: from [10.1.72.50] ([10.1.255.212]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 7 Feb 2013 15:51:26 +0000 Message-ID: <5113CD7D.6080502@arm.com> Date: Thu, 07 Feb 2013 15:51:00 -0000 From: Marcus Shawcroft User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130106 Thunderbird/17.0.2 MIME-Version: 1.0 To: "gdb-patches@sourceware.org" Subject: [PATCH] gdbserver aarch64 fix the clamping of HW break point and watchpoint counts. X-MC-Unique: 113020715512803501 Content-Type: multipart/mixed; boundary="------------000304050308060704000600" 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: 2013-02/txt/msg00178.txt.bz2 This is a multi-part message in MIME format. --------------000304050308060704000600 Content-Type: text/plain; charset=WINDOWS-1252; format=flowed Content-Transfer-Encoding: quoted-printable Content-length: 305 This issue came to light in the recent review of aarch64-linux-nat, and=20 also needs resolving in GDBserver. OK? /Marcus 2013-02-07 Marcus Shawcroft * linux-aarch64-low.c (aarch64_arch_setup): Fix clamping of aarch64_num_wp_regs and aarch64_num_bp_regs.= --------------000304050308060704000600 Content-Type: text/x-patch; name=0001-gdbserver-hwbp-clamping.diff Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gdbserver-hwbp-clamping.diff" Content-length: 1524 diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch6= 4-low.c index e56ea80..3bd9af8 100644 --- a/gdb/gdbserver/linux-aarch64-low.c +++ b/gdb/gdbserver/linux-aarch64-low.c @@ -1202,10 +1202,13 @@ aarch64_arch_setup (void) && AARCH64_DEBUG_ARCH (dreg_state.dbg_info) =3D=3D AARCH64_DEBUG_ARC= H_V8) { aarch64_num_wp_regs =3D AARCH64_DEBUG_NUM_SLOTS (dreg_state.dbg_info= ); - if (aarch64_num_wp_regs > AARCH64_HBP_MAX_NUM) - warning ("Unexpected number of hardware watchpoint registers reported" - " by ptrace, got %d, expected %d.", - aarch64_num_wp_regs, AARCH64_HBP_MAX_NUM); + if (aarch64_num_wp_regs > AARCH64_HWP_MAX_NUM) + { + warning ("Unexpected number of hardware watchpoint registers reported" + " by ptrace, got %d, expected %d.", + aarch64_num_wp_regs, AARCH64_HWP_MAX_NUM); + aarch64_num_wp_regs =3D AARCH64_HWP_MAX_NUM; + } } else { @@ -1220,9 +1223,12 @@ aarch64_arch_setup (void) { aarch64_num_bp_regs =3D AARCH64_DEBUG_NUM_SLOTS (dreg_state.dbg_info= ); if (aarch64_num_bp_regs > AARCH64_HBP_MAX_NUM) - warning ("Unexpected number of hardware breakpoint registers reported" - " by ptrace, got %d, expected %d.", - aarch64_num_bp_regs, AARCH64_HBP_MAX_NUM); + { + warning ("Unexpected number of hardware breakpoint registers reported" + " by ptrace, got %d, expected %d.", + aarch64_num_bp_regs, AARCH64_HBP_MAX_NUM); + aarch64_num_bp_regs =3D AARCH64_HBP_MAX_NUM; + } } else {= --------------000304050308060704000600--