From patchwork Thu Jan 8 05:40:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 4565 Received: (qmail 17880 invoked by alias); 8 Jan 2015 05:40:48 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 17865 invoked by uid 89); 8 Jan 2015 05:40:47 -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, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 08 Jan 2015 05:40:44 +0000 Received: from svr-orw-fem-03.mgc.mentorg.com ([147.34.97.39]) by relay1.mentorg.com with esmtp id 1Y95po-00071R-RV from Yao_Qi@mentor.com ; Wed, 07 Jan 2015 21:40:40 -0800 Received: from GreenOnly (147.34.91.1) by svr-orw-fem-03.mgc.mentorg.com (147.34.97.39) with Microsoft SMTP Server id 14.3.224.2; Wed, 7 Jan 2015 21:40:40 -0800 From: Yao Qi To: Pedro Alves CC: Subject: Re: [PATCH] Clear upper bits during sign extension References: <1419815569-21854-1-git-send-email-yao@codesourcery.com> <54A13184.1070902@redhat.com> <874msdwl39.fsf@codesourcery.com> <54A29886.8030603@redhat.com> <87vbktuu5p.fsf@codesourcery.com> Date: Thu, 8 Jan 2015 13:40:46 +0800 In-Reply-To: <87vbktuu5p.fsf@codesourcery.com> (Yao Qi's message of "Tue, 30 Dec 2014 21:46:58 +0800") Message-ID: <87bnm9u8wx.fsf@codesourcery.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-IsSubscribed: yes Yao Qi writes: >> + byte_order = gdbarch_byte_order (get_type_arch (type)); > > How about getting gdbarch via get_frame_arch (frame)? How about > removing gdb_sign_extend as it is no longer used? > > I'll post a full version on top of yours. Here is the patch, what do you think? diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c index 2bd12d6..bdb2160 100644 --- a/gdb/dwarf2loc.c +++ b/gdb/dwarf2loc.c @@ -2012,6 +2012,7 @@ indirect_pieced_value (struct value *value) int i, bit_offset, bit_length; struct dwarf_expr_piece *piece = NULL; LONGEST byte_offset; + enum bfd_endian byte_order; type = check_typedef (value_type (value)); if (TYPE_CODE (type) != TYPE_CODE_PTR) @@ -2056,11 +2057,16 @@ indirect_pieced_value (struct value *value) /* This is an offset requested by GDB, such as value subscripts. However, due to how synthetic pointers are implemented, this is always presented to us as a pointer type. This means we have to - sign-extend it manually as appropriate. */ - byte_offset = value_as_address (value); - if (TYPE_LENGTH (value_type (value)) < sizeof (LONGEST)) - byte_offset = gdb_sign_extend (byte_offset, - 8 * TYPE_LENGTH (value_type (value))); + sign-extend it manually as appropriate. Use raw + extract_signed_integer directly rather than value_as_address and + sign extend afterwards on architectures that would need it + (mostly everywhere except MIPS, which has signed addresses) as + the later would go through gdbarch_pointer_to_address and thus + return a CORE_ADDR with high bits set on architectures that + encode address spaces and other things in CORE_ADDR. */ + byte_order = gdbarch_byte_order (get_frame_arch (frame)); + byte_offset = extract_signed_integer (value_contents (value), + TYPE_LENGTH (type), byte_order); byte_offset += piece->v.ptr.offset; gdb_assert (piece); diff --git a/gdb/utils.c b/gdb/utils.c index 084db87..72b1e2a 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -3021,23 +3021,6 @@ align_down (ULONGEST v, int n) return (v & -n); } -/* See utils.h. */ - -LONGEST -gdb_sign_extend (LONGEST value, int bit) -{ - gdb_assert (bit >= 1 && bit <= 8 * sizeof (LONGEST)); - - if (((value >> (bit - 1)) & 1) != 0) - { - LONGEST signbit = ((LONGEST) 1) << (bit - 1); - - value = (value ^ signbit) - signbit; - } - - return value; -} - /* Allocation function for the libiberty hash table which uses an obstack. The obstack is passed as DATA. */ diff --git a/gdb/utils.h b/gdb/utils.h index 0a73864..3debde7 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -340,11 +340,6 @@ extern int myread (int, char *, int); extern ULONGEST align_up (ULONGEST v, int n); extern ULONGEST align_down (ULONGEST v, int n); -/* Sign extend VALUE. BIT is the (1-based) index of the bit in VALUE - to sign-extend. */ - -extern LONGEST gdb_sign_extend (LONGEST value, int bit); - /* Resource limits used by getrlimit and setrlimit. */ enum resource_limit_kind