From mboxrd@z Thu Jan 1 00:00:00 1970 From: Luc Van Oostenryck Subject: [PATCH 2/3] change loading of bitfields Date: Mon, 7 Aug 2017 03:33:37 +0200 Message-ID: <20170807013338.46211-3-luc.vanoostenryck@gmail.com> References: <20170807013338.46211-1-luc.vanoostenryck@gmail.com> Return-path: Received: from mail-wm0-f65.google.com ([74.125.82.65]:35361 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751375AbdHGBdu (ORCPT ); Sun, 6 Aug 2017 21:33:50 -0400 Received: by mail-wm0-f65.google.com with SMTP id r77so12119465wmd.2 for ; Sun, 06 Aug 2017 18:33:49 -0700 (PDT) In-Reply-To: <20170807013338.46211-1-luc.vanoostenryck@gmail.com> Sender: linux-sparse-owner@vger.kernel.org List-Id: linux-sparse@vger.kernel.org To: Dibyendu Majumdar Cc: linux-sparse@vger.kernel.org, Luc Van Oostenryck 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 af46191f1..b06cf4e19 100644 --- a/linearize.c +++ b/linearize.c @@ -1077,14 +1077,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 */ -- 2.13.2