From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28490 invoked by alias); 5 Nov 2004 22:37:45 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 28472 invoked from network); 5 Nov 2004 22:37:43 -0000 Received: from unknown (HELO walton.sibelius.xs4all.nl) (82.92.89.47) by sourceware.org with SMTP; 5 Nov 2004 22:37:43 -0000 Received: from elgar.sibelius.xs4all.nl (elgar.sibelius.xs4all.nl [192.168.0.2]) by walton.sibelius.xs4all.nl (8.13.0/8.13.0) with ESMTP id iA5MbWjn032759; Fri, 5 Nov 2004 23:37:32 +0100 (CET) Received: from elgar.sibelius.xs4all.nl (localhost [127.0.0.1]) by elgar.sibelius.xs4all.nl (8.12.6p3/8.12.6) with ESMTP id iA5MbWZ6015156; Fri, 5 Nov 2004 23:37:32 +0100 (CET) (envelope-from kettenis@elgar.sibelius.xs4all.nl) Received: (from kettenis@localhost) by elgar.sibelius.xs4all.nl (8.12.6p3/8.12.6/Submit) id iA5MbWLG015153; Fri, 5 Nov 2004 23:37:32 +0100 (CET) Date: Fri, 05 Nov 2004 22:37:00 -0000 Message-Id: <200411052237.iA5MbWLG015153@elgar.sibelius.xs4all.nl> From: Mark Kettenis To: gdb-patches@sources.redhat.com, cagney@gnu.org, drow@false.org Subject: [COMMIT] Avoid unnecessary indirection when decoding DWARF CFI X-SW-Source: 2004-11/txt/msg00099.txt.bz2 This fixes the problems for me. It's better to skip the indirection here anyway, since it will save a memory read and thus avoids any problems with that. Committed, Mark P.S. Andrew, can you test it on your systems. I still like to get this on the branch since it fixes a nasty problem on SPARC. But it can wait until 6.3.1. Index: ChangeLog from Mark Kettenis * dwarf2-frame.c (decode_frame_entry_1): Avoid indirection when skipping a personality routine in a CIE augmentation. Index: dwarf2-frame.c =================================================================== RCS file: /cvs/src/src/gdb/dwarf2-frame.c,v retrieving revision 1.42 diff -u -p -r1.42 dwarf2-frame.c --- dwarf2-frame.c 5 Nov 2004 15:16:44 -0000 1.42 +++ dwarf2-frame.c 5 Nov 2004 22:30:07 -0000 @@ -1380,8 +1380,8 @@ decode_frame_entry_1 (struct comp_unit * /* "P" indicates a personality routine in the CIE augmentation. */ else if (*augmentation == 'P') { - /* Skip. */ - unsigned char encoding = *buf++; + /* Skip. Avoid indirection since we throw away the result. */ + unsigned char encoding = (*buf++) & ~DW_EH_PE_indirect; read_encoded_value (unit, encoding, buf, &bytes_read); buf += bytes_read; augmentation++;