From patchwork Thu Jun 14 19:04:13 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: 10465037 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 366A560348 for ; Thu, 14 Jun 2018 19:04:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 26EA028BE9 for ; Thu, 14 Jun 2018 19:04:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1BCDB28C0D; Thu, 14 Jun 2018 19:04:42 +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 B941D28BE9 for ; Thu, 14 Jun 2018 19:04:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755423AbeFNTEk (ORCPT ); Thu, 14 Jun 2018 15:04:40 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:39361 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755421AbeFNTEj (ORCPT ); Thu, 14 Jun 2018 15:04:39 -0400 Received: by mail-wm0-f68.google.com with SMTP id p11-v6so13900349wmc.4 for ; Thu, 14 Jun 2018 12:04:39 -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=tGjxNgqVy0g87ea7rAFfa9tdkBT3UPt3v969dFrT718=; b=gQjw2QadjfTdzcXOp5Gv8mza1c3yphi2Kbn4MVFE3FJLgLAPz61uUY2aebqY1Rq0Rh lpfpl9t2FzCYD2nanSMGu/M3Q9gEpcLjANn1O1ayjhi/uljS/ojGmQQEbL1SEgVTnnbN TC71arSp9QUUcp46kB268XVp+HcOFv2EWGVjeJAxZqjMwIMERAMld6uA0EMexmNd2hVu sE++lO6c7N5goTcKGJO9s9gatrJG+eT3bE1wOfZUCXzI8iwoDi4oqWkdezL8DkMoQIlr kl3diz3utx0uJg7+brLcM/f+1wbwC60OzYlT3jVkHOsl+KiqVwNblo03ZDm7IgEv4hIA TezA== 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=tGjxNgqVy0g87ea7rAFfa9tdkBT3UPt3v969dFrT718=; b=n/j2Qrjdh+x7tviamszMpj/PUamGbYhXHDgCVPJm97NMJB04jOeVZt0VvRx5GDXMto ZuLCKV9m/MeZPzcrCnC+PcM8CXMInqlB7WDiraZrb7kHr1BV2LphzWYM6kOq4i2/Q0Ao ukjOaIE7wagI7IYq3XqYhwLog0prJ7Gold7Jtq1uTyWkdu9gLJ4pZ8G5i7g52G3o4xEr LGmt58oLujIpPjEooKJWOCD20EXU7+FPaHlz1Fzp2pa7vsAHxIMB3Goz2SGcNPZqRCEQ CP/aFJmDFnA5jhRH2ZbcCZpWsOlgV//Qi26nFT8iqXk59IPRwB2cB6EqJIkhOjGyOdH9 BXbQ== X-Gm-Message-State: APt69E1YOZyYgspDBKjAaSwkpsVVqa0njbZJ2ljw9Wx9SjkXm6bZ1Y0k whogT7ttgA1naJbKIkdst3OVlbkbhr8= X-Google-Smtp-Source: ADUXVKKd7Anu3XF3cT15rn30axrY/g+SE/mHA9nTV1R7bQdW2vf4tCG6w3/3fiJWliH6pB++3l3RJw== X-Received: by 2002:a50:9eac:: with SMTP id a41-v6mr3620121edf.92.1529003078275; Thu, 14 Jun 2018 12:04:38 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:4033:b700:7008:9bbf:83ef:4c95]) by smtp.gmail.com with ESMTPSA id m42-v6sm3303524edc.94.2018.06.14.12.04.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Jun 2018 12:04:37 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Luc Van Oostenryck Subject: [PATCH 14/20] cast: temporary simplify handling cast to/from void* Date: Thu, 14 Jun 2018 21:04:13 +0200 Message-Id: <20180614190419.28052-15-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180614190419.28052-1-luc.vanoostenryck@gmail.com> References: <20180614190419.28052-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 Currently pointer casts from/to void are treated as casts to/from integer. The rationale being that a void pointer can't anyway be dereferenced. Allow to continue to do so by using a new 'machine type' for void pointers which then allow to select the right type of cast: OP_PTRCAST or OP_[S]CAST. Signed-off-by: Luc Van Oostenryck --- linearize.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/linearize.c b/linearize.c index 85da124b4..9e46c3a16 100644 --- a/linearize.c +++ b/linearize.c @@ -1166,6 +1166,7 @@ enum mtype { MTYPE_UINT, MTYPE_SINT, MTYPE_PTR, + MTYPE_VPTR, // TODO: must be removed ? MTYPE_FLOAT, MTYPE_BAD, }; @@ -1180,8 +1181,7 @@ retry: switch (s->type) { goto retry; case SYM_PTR: if (s->ctype.base_type == &void_ctype) - // handle void pointer like an uint - goto case_int; + return MTYPE_VPTR; return MTYPE_PTR; case SYM_BITFIELD: case SYM_RESTRICT: @@ -1225,14 +1225,25 @@ static int get_cast_opcode(struct symbol *dst, struct symbol *src) switch (stype) { case MTYPE_UINT: case MTYPE_SINT: - if (is_ptr_type(src)) // must be a void pointer - return OP_PTRCAST;// FIXME: to be removed? return OP_UTPTR; case MTYPE_PTR: + case MTYPE_VPTR: return OP_PTRCAST; default: return OP_BADOP; } + case MTYPE_VPTR: + switch (stype) { + case MTYPE_PTR: + case MTYPE_VPTR: + case MTYPE_UINT: + return OP_CAST; + case MTYPE_SINT: + return OP_SCAST; + default: + return OP_BADOP; + break; + } case MTYPE_UINT: case MTYPE_SINT: switch (stype) {