From patchwork Mon Aug 7 19:12:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 9886047 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E05FF602CC for ; Mon, 7 Aug 2017 19:12:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D06042860A for ; Mon, 7 Aug 2017 19:12:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C587F286BF; Mon, 7 Aug 2017 19:12:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 76C9E2860A for ; Mon, 7 Aug 2017 19:12:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751931AbdHGTMR (ORCPT ); Mon, 7 Aug 2017 15:12:17 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:38343 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751919AbdHGTMP (ORCPT ); Mon, 7 Aug 2017 15:12:15 -0400 Received: by mail-wm0-f66.google.com with SMTP id y206so2036183wmd.5 for ; Mon, 07 Aug 2017 12:12:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KeAUxgn8qGHyIf7oy58/I+ufOGqxnOKmo3WNirTwtsk=; b=rck+T7gSnjvn+v6HFAlnLfvy7WCmpnSC017s3qQp62wUbcCKtV3vPCq3dFsnUIWlm7 KS7kcnNVfkGIx/xnAwwc2NJwuCFuPrYqrxMdu4nIcFeIRNldkQNlxNQ1f+nEKWdQks/j 51UUYZc9hkO3p9/wJVFwl0h5bpLG9rRmwGwM4NlGqsuAmAsNeepgbzo6TdWrcWuh2rRN x18i85zC1RsvssJFK5qXgGl7qCO8cKxMPcI0MeQOXyYU2M3f/VEEhrwINeylkXguBH0d vb2DSBgr+cbs/gV2yZfsCHVMHjhQqA8mp6QUtvXQHQakgiVvyGum3FYFCkA5DA9fsJ1R obXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KeAUxgn8qGHyIf7oy58/I+ufOGqxnOKmo3WNirTwtsk=; b=V//QEINSWyFP9F3+bPioqKycp3YQ8aEXS9SyihP7XkbYiRuLYCWPDWQA2SO8E2LKGm qEC7sCJ7OQWGsQzuOVdnEJK0B7fjIHm5ZyQoO7JjJONFsGaHsn2SbZOiC+Acna8PPLn5 zgh4YeBmRv2fHyYHxUDTI0UN2UO6MAphlAtocMXTpLObTmmEbpMQVNSRmr3H5WFmMxri wZ+6fIa9ROX/H9dM0LHUqfNbO/VjX6/TxFK3eGfK/BSTYn9G2Rzv1IDBN4ZHEqPFyz+7 g7jJbxpPC1gmoMCkheG34t6SYO88i7xSBda0vfsPQt8y0894RLHbj18oH2U+oD+KfVXb bVvg== X-Gm-Message-State: AHYfb5hMKMUSZSs/fBLSG3xFkpmsV4MgIR9tpRu8Iu1t2LFm8lSzEcbf dYmJqvQTYeqtBJJC84o= X-Received: by 10.80.151.22 with SMTP id c22mr1937261edb.30.1502133134512; Mon, 07 Aug 2017 12:12:14 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:4076:600:29ff:6bdc:a0fa:4163]) by smtp.gmail.com with ESMTPSA id g52sm7742064edg.34.2017.08.07.12.12.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Aug 2017 12:12:14 -0700 (PDT) From: Luc Van Oostenryck To: Dibyendu Majumdar Cc: linux-sparse@vger.kernel.org, Luc Van Oostenryck Subject: [PATCH v2 4/8] change the masking when loading bitfields Date: Mon, 7 Aug 2017 21:12:01 +0200 Message-Id: <20170807191205.86590-5-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170807191205.86590-1-luc.vanoostenryck@gmail.com> References: <20170807191205.86590-1-luc.vanoostenryck@gmail.com> Sender: linux-sparse-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To make some simplification easier, change the way the masking is done when loading bitfields. Signed-off-by: Luc Van Oostenryck --- linearize.c | 15 +++++++++------ validation/bitfield-size.c | 6 ++++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/linearize.c b/linearize.c index ba76397ea..f833fd8d9 100644 --- a/linearize.c +++ b/linearize.c @@ -1000,14 +1000,17 @@ static pseudo_t linearize_load_gen(struct entrypoint *ep, struct access_data *ad { struct symbol *ctype = ad->result_type; pseudo_t new = add_load(ep, ad); + unsigned int off = ctype->bit_offset; + unsigned int siz = ctype->bit_size; - if (ctype->bit_offset) { - pseudo_t shift = value_pseudo(ctype->bit_offset); - pseudo_t newval = add_binary_op(ep, ad->source_type, OP_LSR, new, shift); - new = newval; + if (siz != type_size(ad->source_type)) { + pseudo_t mask = value_pseudo(((1ULL << siz) - 1) << off); + new = add_binary_op(ep, ad->source_type, OP_AND, new, mask); + } + if (off) { + pseudo_t shift = value_pseudo(off); + new = add_binary_op(ep, ad->source_type, OP_LSR, new, shift); } - if (ctype->bit_size != type_size(ad->source_type)) - new = cast_pseudo(ep, new, ad->source_type, ad->result_type); return new; } diff --git a/validation/bitfield-size.c b/validation/bitfield-size.c index ce78ecf21..c8c94bb15 100644 --- a/validation/bitfield-size.c +++ b/validation/bitfield-size.c @@ -35,7 +35,9 @@ unsigned int get_pbfi_b(struct bfi *bf) { return bf->b; } * check-command: test-linearize -Wno-decl $file * check-output-ignore * - * check-output-pattern-24-times: cast\\. - * check-output-pattern-12-times: cast\\.4 + * check-output-excludes: cast\\.4 + * check-output-pattern-6-times: cast\\. * check-output-pattern-6-times: lsr\\..*\\$6 + * check-output-pattern-6-times: and\\..*\\$15 + * check-output-pattern-6-times: and\\..*\\$960 */