From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30721 invoked by alias); 22 Oct 2015 16:06:55 -0000 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 Received: (qmail 30708 invoked by uid 89); 22 Oct 2015 16:06:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL,BAYES_00,SPF_PASS autolearn=ham version=3.3.2 X-HELO: usevmg20.ericsson.net Received: from usevmg20.ericsson.net (HELO usevmg20.ericsson.net) (198.24.6.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Thu, 22 Oct 2015 16:06:53 +0000 Received: from EUSAAHC001.ericsson.se (Unknown_Domain [147.117.188.75]) by usevmg20.ericsson.net (Symantec Mail Security) with SMTP id 3A.02.32596.4F8A8265; Thu, 22 Oct 2015 11:14:28 +0200 (CEST) Received: from [142.133.110.95] (147.117.188.8) by smtp-am.internal.ericsson.com (147.117.188.77) with Microsoft SMTP Server id 14.3.248.2; Thu, 22 Oct 2015 12:06:49 -0400 Subject: Re: [PATCH v2] Fix inconsistent breakpoint kinds between breakpoints and tracepoints in GDBServer. To: Pedro Alves References: <5628FE0C.5090309@redhat.com> <1445529414-11581-1-git-send-email-antoine.tremblay@ericsson.com> <5629079A.3050809@redhat.com> <562908C6.4010903@ericsson.com> <56290915.9060608@redhat.com> CC: GDB From: Antoine Tremblay Message-ID: <56290999.9070103@ericsson.com> Date: Thu, 22 Oct 2015 19:58:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <56290915.9060608@redhat.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-IsSubscribed: yes X-SW-Source: 2015-10/txt/msg00486.txt.bz2 On 10/22/2015 12:04 PM, Pedro Alves wrote: > On 10/22/2015 05:03 PM, Antoine Tremblay wrote: >> >> >> On 10/22/2015 11:58 AM, Pedro Alves wrote: >>> On 10/22/2015 04:56 PM, Antoine Tremblay wrote: >>>> This patch fixes a regression introduced by : >>>> https://sourceware.org/ml/gdb-patches/2015-10/msg00369.html >>>> >>>> Tests : gdb.trace/trace-break.exp and gdb.trace/trace-mt.exp would fail on x86 >>>> with gdbserver-{native,extended}. >>>> >>>> Before this patch, the breakpoint kind set by GDB with a Z packet and the one >>>> set in the case of a tracepoint would be inconsistent on targets that did not >>>> implement breakpoint_kind_from_pc. On x86 for example a breakpoint set by GDB >>>> would have a kind of 1 but a breakpoint set by a tracepoint would have a kind of >>>> 0. >>>> >>>> This created a missmatch when trying to insert a tracepoint and a breakpoint at >>>> the same location. One of the two breakpoints would be removed with debug >>>> message : "Inconsistent breakpoint kind". >>>> >>>> This patch fixes the issue by changing the default 0 breakpoint kind to be >>>> the size of the breakpoint according to sw_breakpoint_from_kind. >>>> >>>> The default breakpoint kind must be the breakpoint length to keep consistency >>>> between breakpoints set via GDB and the ones set internally by GDBServer. >>>> >>>> No regression on Ubuntu 14.04 x86-64 with gdbserver-{native-extended} >>>> >>>> gdb/gdbserver/ChangeLog: >>>> >>>> * linux-low.c (default_breakpoint_kind_from_pc): New function. >>>> (linux_breakpoint_kind_from_pc): Use default_breakpoint_kind_from_pc for >>>> the default breakpoint kind. >>> >>> OK. >>> >> >> I forgot to set the function default_breakpoint_kind_from_pc static, ok >> with that change ? > > Sure. > > (I think you'll need to move the function to target.c to > fix !Linux ports, but I'm OK with doing that as a separate step.) > I don't think so since I fix !linux ports like so : /* Implementation of the target_ops method "breakpoint_kind_from_pc". */ static int win32_breakpoint_kind_from_pc (CORE_ADDR *pcptr) { return the_low_target.breakpoint_len; } /* Implementation of the target_ops method "sw_breakpoint_from_kind". */ static const gdb_byte * win32_sw_breakpoint_from_kind (int kind, int *size) { *size = the_low_target.breakpoint_len; return the_low_target.breakpoint; } ?