From patchwork Mon Mar 27 21:23:58 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: 9647541 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 29D8460328 for ; Mon, 27 Mar 2017 21:27:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1BC7B1FF28 for ; Mon, 27 Mar 2017 21:27:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 10B85205FD; Mon, 27 Mar 2017 21:27:13 +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 B63211FF28 for ; Mon, 27 Mar 2017 21:27:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752452AbdC0V1M (ORCPT ); Mon, 27 Mar 2017 17:27:12 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:36794 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752215AbdC0V1K (ORCPT ); Mon, 27 Mar 2017 17:27:10 -0400 Received: by mail-wr0-f196.google.com with SMTP id u1so17118238wra.3 for ; Mon, 27 Mar 2017 14:27:08 -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=rW3MvCzbv5oUtwtWwjSrjq9+EaS61vHkLSvfi03hwnI=; b=RoPUZZmtn+bdIOGU5ru8eXNmd1rg9Z7rCSgMUDeXBBIIlvSrOHkUVWfmzMFML9PPgv u9mYcq2Kc3do044I5qv6QbuZcLPJD9af+Q1aW8rzZVqdlAY0TEyZml0JS16dAfRDPeJr zjZM+ZPlelwnIp+7euyKFDSYqKhQgJNrMKJV/jhWZ4iPNb1iNoXQUIBtI/xixDrU/ROl 2V2fnV+1d+uUDThGTxIaD6Fi4OFZS0So7047Jgqarf7K96d5hrsP0mUONkxLzQvply29 o8laQ1Dj6CkxP5bJqlQBuvxiy54rIiULzVXbvo1MD2y+if4cRKB9JGKlTdYiLwGBEWR+ YSgg== 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=rW3MvCzbv5oUtwtWwjSrjq9+EaS61vHkLSvfi03hwnI=; b=tHgsonySGYAgQVT1fI6waC+Y22bmfJrdO8dLKhK72BOoIxxf5DiNWDJsUFTo1awm6z RAQrC7PsA0QNmTxVa4DohFVfygeABPez74REedVXq+HXBl/tYy7gquS8QZ12KyNC7usS 9W1E/t4bGYt5GiEuSjq3DhEWqMt96WPTNEevwmSrqPVMCHFwe3DvToWW6pQs+pZJtR5S 6CPg2fAd0tAlxAOuYhlQVFzPOIUJbU1PT/Qwda2VP/PBWGfWsug0PtD0uteFWmUx7JBA u1EISNt4YnfCQf35DoPSxFWRE6aJ2X7wmcq/FSYpRmflMnZeVdHWqEA9sNNRyz7QuTgX 5mEQ== X-Gm-Message-State: AFeK/H313HrcP6ixtQg9jIaFvJkHuklH0PQ8tP76M6SRG1M4duNbwxBXxXuJuSEOe0tB5w== X-Received: by 10.28.99.68 with SMTP id x65mr11680974wmb.86.1490650018000; Mon, 27 Mar 2017 14:26:58 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:802:b00:496:ae63:aebb:a034]) by smtp.gmail.com with ESMTPSA id k203sm973767wmk.4.2017.03.27.14.26.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Mar 2017 14:26:57 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Luc Van Oostenryck Subject: [PATCH v6 34/52] llvm: make value_to_ivalue() more flexible Date: Mon, 27 Mar 2017 23:23:58 +0200 Message-Id: <20170327212416.18536-35-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170327212416.18536-1-luc.vanoostenryck@gmail.com> References: <20170327212416.18536-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 Signed-off-by: Luc Van Oostenryck --- sparse-llvm.c | 15 ++++++++++----- validation/backend/shift-special.c | 13 +++++++++++++ 2 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 validation/backend/shift-special.c diff --git a/sparse-llvm.c b/sparse-llvm.c index 57f662a79..4be3e4358 100644 --- a/sparse-llvm.c +++ b/sparse-llvm.c @@ -413,13 +413,18 @@ static LLVMValueRef pseudo_to_rvalue(struct function *fn, struct instruction *in return LLVMBuildBitCast(fn->builder, val, dtype, name); } -static LLVMValueRef value_to_ivalue(struct function *fn, LLVMValueRef val) +static LLVMValueRef value_to_ivalue(struct function *fn, struct symbol *ctype, LLVMValueRef val) { + const char *name = LLVMGetValueName(val); + LLVMTypeRef dtype = symbol_type(ctype); + if (LLVMGetTypeKind(LLVMTypeOf(val)) == LLVMPointerTypeKind) { LLVMTypeRef dtype = LLVMIntType(bits_in_pointer); - const char *name = LLVMGetValueName(val); val = LLVMBuildPtrToInt(fn->builder, val, dtype, name); } + if (ctype && is_int_type(ctype)) { + val = LLVMBuildIntCast(fn->builder, val, dtype, name); + } return val; } @@ -445,7 +450,7 @@ static LLVMValueRef value_to_pvalue(struct function *fn, struct symbol *ctype, L static LLVMValueRef adjust_type(struct function *fn, struct symbol *ctype, LLVMValueRef val) { if (is_int_type(ctype)) - return value_to_ivalue(fn, val); + return value_to_ivalue(fn, ctype, val); if (is_ptr_type(ctype)) return value_to_pvalue(fn, ctype, val); return val; @@ -511,10 +516,10 @@ static void output_op_binary(struct function *fn, struct instruction *insn) char target_name[64]; lhs = pseudo_to_value(fn, insn, insn->src1); - lhs = value_to_ivalue(fn, lhs); + lhs = value_to_ivalue(fn, insn->type, lhs); rhs = pseudo_to_value(fn, insn, insn->src2); - rhs = value_to_ivalue(fn, rhs); + rhs = value_to_ivalue(fn, insn->type, rhs); pseudo_name(insn->target, target_name); diff --git a/validation/backend/shift-special.c b/validation/backend/shift-special.c new file mode 100644 index 000000000..d5e4d3d32 --- /dev/null +++ b/validation/backend/shift-special.c @@ -0,0 +1,13 @@ +long shift(long a, short b); +long shift(long a, short b) +{ + long r1 = a << b; + long r2 = b << a; + + return r1 + r2; +} + +/* + * check-name: shift-special + * check-command: ./sparsec -c $file -o tmp.o + */