From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22360 invoked by alias); 13 Feb 2009 18:42:24 -0000 Received: (qmail 22352 invoked by uid 22791); 13 Feb 2009 18:42:23 -0000 X-SWARE-Spam-Status: No, hits=0.3 required=5.0 tests=AWL,BAYES_00,BOTNET,SPF_PASS X-Spam-Check-By: sourceware.org Received: from hq2.tensilica.com (HELO maia.hq.tensilica.com) (65.205.227.30) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 13 Feb 2009 18:42:09 +0000 Received: from [192.168.11.68] (maxim_fc5.hq.tensilica.com [192.168.11.68]) (authenticated bits=0) by maia.hq.tensilica.com (8.13.1/8.13.1) with ESMTP id n1DIfxhu018742; Fri, 13 Feb 2009 10:41:59 -0800 Message-ID: <4995BEF7.3040906@hq.tensilica.com> Date: Fri, 13 Feb 2009 18:58:00 -0000 From: Maxim Grigoriev User-Agent: Thunderbird 1.5.0.12 (X11/20070530) MIME-Version: 1.0 To: Pierre Muller CC: gdb-patches@sourceware.org, maxim2405@gmail.com Subject: Re: [RFA] xtensa-tdep.c ARI fix References: <005801c98dfc$2252da60$66f88f20$@u-strasbg.fr> In-Reply-To: <005801c98dfc$2252da60$66f88f20$@u-strasbg.fr> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-IsSubscribed: yes 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-02/txt/msg00309.txt.bz2 Hello Pierre, >> Maxim, is this OK? Yes. Thank you very much for noticing this issue and making a clean-up. -- Maxim Pierre Muller wrote: > Current ARI > has one critical "hash" failure: > > hash 1 Do not use ` #...', instead use `#...' > (some compilers only correctly parse a C preprocessor directive when `#' is > the first character on the line) > > coming from xtensa-tdep.c > It appears that the offending line is > #define BSZ 32 /* Instruction buffer size. */ > I could have removed the starting spaces and commit the change as obvious, > but there is already a macro defining the instruction buffer size > at line 1050: > #define XTENSA_ISA_BSZ 32 /* Instruction buffer size. */ > > So I propose here a patch getting rid of the BSZ macro > and using XTENSA_ISA_BSZ in place of BSZ > in call0_analyse_prologue function. > > Maxim, is this OK? > > > 2009-02-13 Pierre Muller > > * xtensa-tdep.c (call0_analyze_prologue): Delete BSZ macro. > Replace BSZ macro uses by XTENSA_ISA_BSZ macro. > > > > Index: xtensa-tdep.c > =================================================================== > RCS file: /cvs/src/src/gdb/xtensa-tdep.c,v > retrieving revision 1.30 > diff -u -p -r1.30 xtensa-tdep.c > --- xtensa-tdep.c 3 Jan 2009 05:57:54 -0000 1.30 > +++ xtensa-tdep.c 13 Feb 2009 16:44:55 -0000 > @@ -2092,8 +2092,7 @@ call0_analyze_prologue (CORE_ADDR start, > CORE_ADDR ia; /* Current insn address in prologue. */ > CORE_ADDR ba = 0; /* Current address at base of insn buffer. */ > CORE_ADDR bt; /* Current address at top+1 of insn > buffer. > */ > - #define BSZ 32 /* Instruction buffer size. */ > - char ibuf[BSZ]; /* Instruction buffer for decoding prologue. */ > + char ibuf[XTENSA_ISA_BSZ];/* Instruction buffer for decoding prologue. > */ > xtensa_isa isa; /* libisa ISA handle. */ > xtensa_insnbuf ins, slot; /* libisa handle to decoded insn, slot. */ > xtensa_format ifmt; /* libisa instruction format. */ > @@ -2153,7 +2152,7 @@ call0_analyze_prologue (CORE_ADDR start, > if (!xtensa_default_isa) > xtensa_default_isa = xtensa_isa_init (0, 0); > isa = xtensa_default_isa; > - gdb_assert (BSZ >= xtensa_isa_maxlength (isa)); > + gdb_assert (XTENSA_ISA_BSZ >= xtensa_isa_maxlength (isa)); > ins = xtensa_insnbuf_alloc (isa); > slot = xtensa_insnbuf_alloc (isa); > > @@ -2166,7 +2165,7 @@ call0_analyze_prologue (CORE_ADDR start, > if (ia + xtensa_isa_maxlength (isa) > bt) > { > ba = ia; > - bt = (ba + BSZ) < body_pc ? ba + BSZ : body_pc; > + bt = (ba + XTENSA_ISA_BSZ) < body_pc ? ba + XTENSA_ISA_BSZ : > body_pc; > read_memory (ba, ibuf, bt - ba); > } > >