From patchwork Sat Jul 21 21:16:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 10539033 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BEC97A69F for ; Sun, 22 Jul 2018 00:57:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9142128CC7 for ; Sat, 21 Jul 2018 21:17:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8516B28CC9; Sat, 21 Jul 2018 21:17:08 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,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 3757C28CC7 for ; Sat, 21 Jul 2018 21:17:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728084AbeGUWLO (ORCPT ); Sat, 21 Jul 2018 18:11:14 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:40859 "EHLO mail-ed1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728130AbeGUWLO (ORCPT ); Sat, 21 Jul 2018 18:11:14 -0400 Received: by mail-ed1-f66.google.com with SMTP id e19-v6so12477886edq.7 for ; Sat, 21 Jul 2018 14:17:06 -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=nSt+APK+Kwp6A5Ru4SodR94q+/bT+F7Oce+gZtr0REc=; b=H3SMbh5EPhcNSpm42+ayknGKrrNLbn9yLb+d0ZyyLhZgkv+JS0WRy7Ubu2k2L6ZuRF gaPVT6OkhNgd0FUMXoiSpZWct9y/1VW9amVgpUDSz4169kPyOQT3Tse4qw0L08aC2hdM 01T+hjHZ7bv4mQ1qVEgXI/VrANdAAV3j9lEy05cmXWCRsxBeHfUEY8XXotbsvCCiUB+t F7jpl5/er8fDBL4fpGeWUZqJT0gMPWlsGk8E4l7VbsxlTsS1Z52cPZGCwsxuVzTQB4oO 3lSkvgrcFFqJ8oYzIS1TLm5fb2JrwjARk2omAKbMIq7WdvWaoDunU2F09Zy28xdPsDbZ nikg== 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=nSt+APK+Kwp6A5Ru4SodR94q+/bT+F7Oce+gZtr0REc=; b=hQEWXE+cuJCvx2q79g9ARybU3T/Jzwro+8T6AsHbN+jDd2Zi8EgaZ4s/FG8bYj2QY4 b+1FQhSOPVcQFpckgrIil6CqScWdvXobCXh5yxP5yQm7VBDpqJ3xm5f3vKdg8F5ovWp3 bwHRZUK9G2mx5zNvPThAnuj/xt0l35Qt6yox/hM5KjM4cjRt1dy3h+iTeBpz/Vl7Xjv8 jg06st+//8jGSUqN9EHPkNiSltiLxNbCwdlWUOPzZKPiddsEaFOTkjwZ4IjPjyjS2eZa Dk5mXqOV9PVf/+qqkVfsyDrmhVSjosYC+tfP23ieyS2aVvICavELtJsHQiwKFR4B/LjK +Atw== X-Gm-Message-State: AOUpUlHLF9o+Xt3OwjqUoMeu3YRDbm6XDIwyjHUpbZTDVnnI/J+/bgif p2UOt4k9S/q1bvKR2cWlJOfAcTqz X-Google-Smtp-Source: AAOMgpfi1BkN+cXh/1eh9uBdY7mSFi8hm/q+zayBKj0IxfWiAeheGt/CqKBDYwBbkHBMPWC4qAURpQ== X-Received: by 2002:a50:fe13:: with SMTP id f19-v6mr7648204edt.291.1532207825441; Sat, 21 Jul 2018 14:17:05 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:4056:df00:2c15:f8b2:e0d5:934c]) by smtp.gmail.com with ESMTPSA id y12-v6sm2636768edq.55.2018.07.21.14.17.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Jul 2018 14:17:05 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Luc Van Oostenryck Subject: [PATCH 03/16] bitfield: extract linearize_bitfield_extract() Date: Sat, 21 Jul 2018 23:16:40 +0200 Message-Id: <20180721211653.72853-4-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180721211653.72853-1-luc.vanoostenryck@gmail.com> References: <20180721211653.72853-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 linearize_load_gen() is complex because it not only has to do the loading of a value from some address but it also has to handle the extraction of bitfields. Isolate this operation in a separate function in order to facilitate the incoming changes there. --- linearize.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/linearize.c b/linearize.c index 938dbc07b..273a534f2 100644 --- a/linearize.c +++ b/linearize.c @@ -1061,6 +1061,19 @@ static pseudo_t add_symbol_address(struct entrypoint *ep, struct symbol *sym) return target; } +static pseudo_t linearize_bitfield_extract(struct entrypoint *ep, + pseudo_t val, struct symbol *ctype, struct symbol *btype) +{ + unsigned int off = ctype->bit_offset; + + if (off) { + pseudo_t shift = value_pseudo(off); + val = add_binary_op(ep, btype, OP_LSR, val, shift); + } + val = cast_pseudo(ep, val, btype, ctype); + return val; +} + static pseudo_t linearize_load_gen(struct entrypoint *ep, struct access_data *ad) { struct symbol *ctype = ad->type; @@ -1071,13 +1084,8 @@ static pseudo_t linearize_load_gen(struct entrypoint *ep, struct access_data *ad return VOID; new = add_load(ep, ad); - if (ctype->bit_offset) { - pseudo_t shift = value_pseudo(ctype->bit_offset); - pseudo_t newval = add_binary_op(ep, btype, OP_LSR, new, shift); - new = newval; - } if (ctype->bit_size != type_size(btype)) - new = cast_pseudo(ep, new, btype, ctype); + new = linearize_bitfield_extract(ep, new, ctype, btype); return new; }