From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 4A096385781A for ; Thu, 24 Sep 2020 19:39:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4A096385781A Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-381-3A7nrKjtM-qXPMgzZRDlhQ-1; Thu, 24 Sep 2020 15:39:41 -0400 X-MC-Unique: 3A7nrKjtM-qXPMgzZRDlhQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 357871018721; Thu, 24 Sep 2020 19:39:40 +0000 (UTC) Received: from tucnak.zalov.cz (ovpn-112-37.ams2.redhat.com [10.36.112.37]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D48F978816; Thu, 24 Sep 2020 19:39:39 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.15.2/8.15.2) with ESMTP id 08OJdaHt025971; Thu, 24 Sep 2020 21:39:36 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.15.2/8.15.2/Submit) id 08OJdZHV025970; Thu, 24 Sep 2020 21:39:35 +0200 Date: Thu, 24 Sep 2020 21:39:35 +0200 From: Jakub Jelinek To: Mark Wielaard Cc: dwz@sourceware.org Subject: Re: [PATCH 1/4] Calculate size and write correct DWARF5 header Message-ID: <20200924193935.GO2176@tucnak> Reply-To: Jakub Jelinek References: <20200924162557.15870-1-mark@klomp.org> <20200924162557.15870-2-mark@klomp.org> MIME-Version: 1.0 In-Reply-To: <20200924162557.15870-2-mark@klomp.org> User-Agent: Mutt/1.11.3 (2019-02-01) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: dwz@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Dwz mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Sep 2020 19:39:44 -0000 On Thu, Sep 24, 2020 at 06:25:54PM +0200, Mark Wielaard wrote: > @@ -7209,6 +7225,8 @@ partition_dups_1 (dw_die_ref *arr, size_t vec_size, > /* CU Header: address_size (ubyte). > 1 byte. */ > + 1 > + /* DWARF5 CU header: unit_type (ubyte). */ > + + die_cu (arr[i])->cu_version >= 5 ? 1 : 0 > /* CU Root DIE: abbreviation code (unsigned LEB128). > 1 or more bytes. Optimistically assume 1. */ > + 1 The above looks incorrect. 4 + 2 + 4 + 1 + x >= 5 ? 1 : 0 + 1 + 4 + 4 is (11 + x >= 5) ? 1 : (0 + 1 + 4 + 4) rather than 4 + 2 + 4 + 1 + (x >= 5 ? 1 : 0) + 1 + 4 + 4 we need there. So, please add ()s around. > @@ -10451,7 +10473,8 @@ compute_abbrevs (DSO *dso) > dw_die_ref *intracuarr, *intracuvec; > enum dwarf_form intracuform = DW_FORM_ref4; > dw_die_ref child, *lastotr, child_next, *last; > - unsigned int headersz = cu->cu_kind == CU_TYPES ? 23 : 11; > + unsigned int headersz = (cu->cu_kind == CU_TYPES > + ? 23 : (cu->cu_version >= 5 ? 12 : 11)); Is the DWARF 5 .debug_info types header also 23 bytes long? Jakub