From patchwork Fri Mar 24 23:20:57 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: 9644245 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 AB62F6020B for ; Fri, 24 Mar 2017 23:24:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D6B026530 for ; Fri, 24 Mar 2017 23:24:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9255D27B13; Fri, 24 Mar 2017 23:24:22 +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 45A0F26530 for ; Fri, 24 Mar 2017 23:24:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936164AbdCXXYW (ORCPT ); Fri, 24 Mar 2017 19:24:22 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:34952 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936553AbdCXXYR (ORCPT ); Fri, 24 Mar 2017 19:24:17 -0400 Received: by mail-wr0-f193.google.com with SMTP id u108so606618wrb.2 for ; Fri, 24 Mar 2017 16:24:15 -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=Tsm3o9cg759afN7ic3YKdJgvcymBHgLJbQRBdGEGLes=; b=iJRkwDtHSme19HJ6xq1Qr0WQaZlPbMFWGNkTFvctvi85+Eiz0KiAmTR/KDKtd5nCFx 1xBorVHVAwZHR6shwt5ObyyIjqE8sN5CvMFpRl8e0UcIuJf+3DHNjot457aqOd6pnkqM pM7JUcTk3ihUDDDtjqn7qKzxG8zIgpvWOPRLtuaukA9UCVBX7HAHlRLMDc7Hl/suEo61 Rqi9tOGWecakNLZySiznc4otJvdudr3423daD8zXHuKzA8YxUXCwaW/+PUL1941PK7Ab 8F/PhOMYHpNLY7riJCymfBUxc+gQwozQ8FlqxEi1uakc9amCdaZetGT3dUHFOAraUKPu 39Kg== 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=Tsm3o9cg759afN7ic3YKdJgvcymBHgLJbQRBdGEGLes=; b=oTc/pHQzdY3/x9yN/sL/SEM+iYlWjSx1vPatWci7cXr8WmJAU26pmOCrE4OV4rSfo6 QSimpGNcn9GTVRtnt52OSKowA4l0fju5wxz9tCnVcPSx6TblsfsYsK8IjZVS3DNLdFXZ /UkmYvH5Ws/GLZst5OozKW8iimOayw+gWRxFynJgCe2uq3nsEtQxQM6oFqJfEVf+SEm0 2QqUwnhunLQ9WBWrzCqVBYUgMDn4bPHZbpaH1pY7VyrImwbWSqqHMafRoOr2pfsgh1tP /Qw0lCPTFZAmWI9lTMHq0suh2xVnM4ch9PgX85sL5zQLmwl4ETF22b9VQIsmOAOcYh0h z4vw== X-Gm-Message-State: AFeK/H1K2uO2IjIbI06kjR8623ZkOu2MqHMKxMIIXF9jKC0pImEzmPgRMa0uWFS/xFyseQ== X-Received: by 10.223.171.79 with SMTP id r15mr168420wrc.148.1490397854801; Fri, 24 Mar 2017 16:24:14 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:802:b00:81c3:4cc:f845:762c]) by smtp.gmail.com with ESMTPSA id m188sm4203730wmm.7.2017.03.24.16.24.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Mar 2017 16:24:14 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Luc Van Oostenryck Subject: [PATCH v5 51/51] llvm: cleanup of output_[ptr]cast() Date: Sat, 25 Mar 2017 00:20:57 +0100 Message-Id: <20170324232057.15033-52-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170324232057.15033-1-luc.vanoostenryck@gmail.com> References: <20170324232057.15033-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 | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/sparse-llvm.c b/sparse-llvm.c index b8a52b9ac..deb0054c8 100644 --- a/sparse-llvm.c +++ b/sparse-llvm.c @@ -875,21 +875,17 @@ static void output_op_ptrcast(struct function *fn, struct instruction *insn) LLVMOpcode op; char target_name[64]; + assert(is_ptr_type(insn->type)); src = get_operand(fn, otype, insn->src); pseudo_name(insn->target, target_name); - assert(!is_float_type(insn->type)); - - dtype = insn_symbol_type(insn); - switch (LLVMGetTypeKind(LLVMTypeOf(src))) { - case LLVMPointerTypeKind: + dtype = symbol_type(insn->type); + if (is_ptr_type(otype)) { op = LLVMBitCast; - break; - case LLVMIntegerTypeKind: + } else if (is_int_type(otype)) { op = LLVMIntToPtr; - break; - default: + } else { assert(0); } @@ -903,38 +899,27 @@ static void output_op_cast(struct function *fn, struct instruction *insn, LLVMOp LLVMTypeRef dtype; struct symbol *otype = insn->orig_type; char target_name[64]; - unsigned int width; if (is_ptr_type(insn->type)) // cast to void* is OP_CAST ... return output_op_ptrcast(fn, insn); + assert(is_int_type(insn->type)); src = get_operand(fn, otype, insn->src); pseudo_name(insn->target, target_name); - assert(!is_float_type(insn->type)); - dtype = symbol_type(insn->type); - switch (LLVMGetTypeKind(LLVMTypeOf(src))) { - case LLVMPointerTypeKind: + if (is_ptr_type(otype)) { op = LLVMPtrToInt; - break; - case LLVMIntegerTypeKind: - width = LLVMGetIntTypeWidth(LLVMTypeOf(src)); + } else if (is_float_type(otype)) { + op = (op == LLVMZExt) ? LLVMFPToUI : LLVMFPToSI; + } else if (is_int_type(otype)) { + unsigned int width = otype->bit_size; if (insn->size < width) op = LLVMTrunc; else if (insn->size == width) op = LLVMBitCast; - break; - case LLVMHalfTypeKind: - case LLVMFloatTypeKind: - case LLVMDoubleTypeKind: - case LLVMX86_FP80TypeKind: - case LLVMFP128TypeKind: - case LLVMPPC_FP128TypeKind: - op = (op == LLVMZExt) ? LLVMFPToUI : LLVMFPToSI; - break; - default: + } else { assert(0); }