From patchwork Mon Mar 27 21:23:34 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: 9647477 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 AF079601D7 for ; Mon, 27 Mar 2017 21:26:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E9FE28419 for ; Mon, 27 Mar 2017 21:26:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 935662842E; Mon, 27 Mar 2017 21:26:38 +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 2DEE528422 for ; Mon, 27 Mar 2017 21:26:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751985AbdC0V0h (ORCPT ); Mon, 27 Mar 2017 17:26:37 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:36497 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751810AbdC0V0h (ORCPT ); Mon, 27 Mar 2017 17:26:37 -0400 Received: by mail-wr0-f196.google.com with SMTP id u1so17116035wra.3 for ; Mon, 27 Mar 2017 14:26:35 -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=PgYguSb+I0390xfUt2UjtQIsnw6B8tL3dFXMs+QQAxE=; b=YAXcI4jMrmpil5xAu98r758sxBmQENAHWZFUgN3Pwt6SVRYNqPUE43sJOT6ekyNsEg 1120GHxUUnD8//fht+zePWJpgXvFlZuqPXjgk/gT6bEF0UdpTS2enxJ4zUUDC6STxuCh DrkUv5uLrG9ju4bY3PvIHi+SWSLvOluilrqlvPHm5p+raO3MIBNgutH4vbgOWlBEu4xt f0OqHeR37kIUENgLzN1pkBa7e+aBsf50uUWVCgYdDgtfR5d+44Ky4J0ekeF9rk1zooz2 vnLNloqT9n3vlPeEhdu76BqbqJV1tEnnjbGdjykFlQrhD8cN+BXQJ5rj8FMCMNm66V6a 07vA== 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=PgYguSb+I0390xfUt2UjtQIsnw6B8tL3dFXMs+QQAxE=; b=K/PhvwXbOwd2tqeRW0Uk5dGhQioHz9K1f+tgbeaus1VSz8FbVbtUXjMkF7jlRxldBS KTl5HX3pVNyD7V7pmF3eVBggdyfCSxwk7pWm+ockNk7ng20ErER7lTd3vJmuh/Bew0wn wMsDCsAcxROZFclAG/Gu2tWddz1X/ynx6G8JLJm3YmEnpVVeGAup7lm2GxT3yf2pL4AC Jc90PTiCbP5xdfneKly3NH5eSl/7rsYr0TE0PXNvKTPzjcIfeIuLidwAkMSZZB6hbF+x ro3QCg+UgW3/vQ6Mkb1f+BnkAoPKckMbRPvXU6W6XgI/gGpnSTbPo0d6AP5oZoxPTEs7 pDPQ== X-Gm-Message-State: AFeK/H3Dqrkp6hWsZTaniQXt8HNjPaD10H6u9h6h70OkVruCulys/zOINhU4EZlyu+Elww== X-Received: by 10.28.20.70 with SMTP id 67mr11755645wmu.86.1490649994718; Mon, 27 Mar 2017 14:26:34 -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.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Mar 2017 14:26:34 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Luc Van Oostenryck Subject: [PATCH v6 10/52] llvm: fix test of floating-point type Date: Mon, 27 Mar 2017 23:23:34 +0200 Message-Id: <20170327212416.18536-11-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 | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/sparse-llvm.c b/sparse-llvm.c index 3435295f5..1b19721c8 100644 --- a/sparse-llvm.c +++ b/sparse-llvm.c @@ -25,14 +25,6 @@ struct function { LLVMModuleRef module; }; -static inline bool symbol_is_fp_type(struct symbol *sym) -{ - if (!sym) - return false; - - return sym->ctype.base_type == &fp_type; -} - static LLVMTypeRef symbol_type(struct symbol *sym); static LLVMTypeRef func_return_type(struct symbol *sym) @@ -154,7 +146,7 @@ static LLVMTypeRef sym_basetype_type(struct symbol *sym) { LLVMTypeRef ret = NULL; - if (symbol_is_fp_type(sym)) { + if (is_float_type(sym)) { switch (sym->bit_size) { case 32: ret = LLVMFloatType(); @@ -454,69 +446,69 @@ static void output_op_binary(struct function *fn, struct instruction *insn) switch (insn->opcode) { /* Binary */ case OP_ADD: - if (symbol_is_fp_type(insn->type)) + if (is_float_type(insn->type)) target = LLVMBuildFAdd(fn->builder, lhs, rhs, target_name); else target = LLVMBuildAdd(fn->builder, lhs, rhs, target_name); break; case OP_SUB: - if (symbol_is_fp_type(insn->type)) + if (is_float_type(insn->type)) target = LLVMBuildFSub(fn->builder, lhs, rhs, target_name); else target = LLVMBuildSub(fn->builder, lhs, rhs, target_name); break; case OP_MULU: - if (symbol_is_fp_type(insn->type)) + if (is_float_type(insn->type)) target = LLVMBuildFMul(fn->builder, lhs, rhs, target_name); else target = LLVMBuildMul(fn->builder, lhs, rhs, target_name); break; case OP_MULS: - assert(!symbol_is_fp_type(insn->type)); + assert(!is_float_type(insn->type)); target = LLVMBuildMul(fn->builder, lhs, rhs, target_name); break; case OP_DIVU: - if (symbol_is_fp_type(insn->type)) + if (is_float_type(insn->type)) target = LLVMBuildFDiv(fn->builder, lhs, rhs, target_name); else target = LLVMBuildUDiv(fn->builder, lhs, rhs, target_name); break; case OP_DIVS: - assert(!symbol_is_fp_type(insn->type)); + assert(!is_float_type(insn->type)); target = LLVMBuildSDiv(fn->builder, lhs, rhs, target_name); break; case OP_MODU: - assert(!symbol_is_fp_type(insn->type)); + assert(!is_float_type(insn->type)); target = LLVMBuildURem(fn->builder, lhs, rhs, target_name); break; case OP_MODS: - assert(!symbol_is_fp_type(insn->type)); + assert(!is_float_type(insn->type)); target = LLVMBuildSRem(fn->builder, lhs, rhs, target_name); break; case OP_SHL: - assert(!symbol_is_fp_type(insn->type)); + assert(!is_float_type(insn->type)); target = LLVMBuildShl(fn->builder, lhs, rhs, target_name); break; case OP_LSR: - assert(!symbol_is_fp_type(insn->type)); + assert(!is_float_type(insn->type)); target = LLVMBuildLShr(fn->builder, lhs, rhs, target_name); break; case OP_ASR: - assert(!symbol_is_fp_type(insn->type)); + assert(!is_float_type(insn->type)); target = LLVMBuildAShr(fn->builder, lhs, rhs, target_name); break; /* Logical */ case OP_AND: - assert(!symbol_is_fp_type(insn->type)); + assert(!is_float_type(insn->type)); target = LLVMBuildAnd(fn->builder, lhs, rhs, target_name); break; case OP_OR: - assert(!symbol_is_fp_type(insn->type)); + assert(!is_float_type(insn->type)); target = LLVMBuildOr(fn->builder, lhs, rhs, target_name); break; case OP_XOR: - assert(!symbol_is_fp_type(insn->type)); + assert(!is_float_type(insn->type)); target = LLVMBuildXor(fn->builder, lhs, rhs, target_name); break; case OP_AND_BOOL: { @@ -781,7 +773,7 @@ static void output_op_ptrcast(struct function *fn, struct instruction *insn) pseudo_name(insn->target, target_name); - assert(!symbol_is_fp_type(insn->type)); + assert(!is_float_type(insn->type)); target = LLVMBuildBitCast(fn->builder, src, insn_symbol_type(insn), target_name); @@ -799,7 +791,7 @@ static void output_op_cast(struct function *fn, struct instruction *insn, LLVMOp pseudo_name(insn->target, target_name); - assert(!symbol_is_fp_type(insn->type)); + assert(!is_float_type(insn->type)); if (insn->size < LLVMGetIntTypeWidth(LLVMTypeOf(src))) target = LLVMBuildTrunc(fn->builder, src, insn_symbol_type(insn), target_name);