From patchwork Fri Mar 24 23:20:15 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: 9644161 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 E195C6020B for ; Fri, 24 Mar 2017 23:23:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D3A2A26530 for ; Fri, 24 Mar 2017 23:23:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C718127B13; Fri, 24 Mar 2017 23:23:41 +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 6C0D626530 for ; Fri, 24 Mar 2017 23:23:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935392AbdCXXXk (ORCPT ); Fri, 24 Mar 2017 19:23:40 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:36587 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935335AbdCXXXh (ORCPT ); Fri, 24 Mar 2017 19:23:37 -0400 Received: by mail-wr0-f195.google.com with SMTP id u1so596766wra.3 for ; Fri, 24 Mar 2017 16:23:36 -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=N3s+Pt/lpMjv9B3RWdl9p9DPS6HprCf487uJvIitJLw=; b=FtH2cs57+MrMW+IipplsMCjRvipy2K8ydYFcWjiIMU2FcN3hzbyn7gYfAgjxHPodYc n32B0Cd8nQ6Sd2yGzbO693qNKZoAeIYJytnpZhSj88cjW8lmK6fn5f+NbqQhpCrGbIuV j95R7VndZru3ycwLjkRSGfbypUil2Ta9XoKQsnCwWiy0dTkYMITkgI8hZHPL40oe0aSL RBjiCFkXmpwLqwuqEzj00e7Lbi5MIzFifHJ9Nfp1VSEtriz+T1czLc29HqAXo1Z6jp/i GUzwziGUe51pWs4CL7HBSCIJCe282cs3tIvlqESh3zjGO59dWWIGM7q/vwynY3gL4r4G MtsQ== 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=N3s+Pt/lpMjv9B3RWdl9p9DPS6HprCf487uJvIitJLw=; b=DJuiPWkCH82ZxAjvkjRAIDPNE5ldc2Kv3d6Lck+0BhdicAIcLoglRGuL8Pd39pUQ4W pBsUbAFrotARrNxLmg4xEnzDnN+I7qy06/3dVw1Bee2tINpC134750ce6AT1+csv/NO/ vMn0oJGEvXfrOziUlfPSmZD4so17hKPwkdn4T3U4yANinlKZGvxAHeZpB+duaF42GdB/ 5HqadLfcGWtqTW5hYy3U/tXrPnTpBPSU6HyluUOgZvX4J+zuCyffBO+mspu6Mca8AObe aMMMstCidm71+umWGhwxWG+cLKSu2YzwhHkhmBmg0a9bImi0vS5jL2434V9CS5QzDVUw iWuA== X-Gm-Message-State: AFeK/H3EyVy1SSBzjQhFHLfWUl3ScEpDNDKLOh453M5vkL+DIzB/X7G0pjKk2+0/yHBZvA== X-Received: by 10.223.176.175 with SMTP id i44mr10199714wra.96.1490397815241; Fri, 24 Mar 2017 16:23:35 -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.23.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Mar 2017 16:23:34 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Luc Van Oostenryck Subject: [PATCH v5 09/51] llvm: extract get_sym_value() from pseudo_to_value() Date: Sat, 25 Mar 2017 00:20:15 +0100 Message-Id: <20170324232057.15033-10-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 | 100 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 53 insertions(+), 47 deletions(-) diff --git a/sparse-llvm.c b/sparse-llvm.c index 072cf2638..d7e8ee725 100644 --- a/sparse-llvm.c +++ b/sparse-llvm.c @@ -305,6 +305,57 @@ static void pseudo_name(pseudo_t pseudo, char *buf) } } +static LLVMValueRef get_sym_value(struct function *fn, struct symbol *sym) +{ + LLVMValueRef result = NULL; + struct expression *expr; + + assert(sym->bb_target == NULL); + + expr = sym->initializer; + if (expr) { + switch (expr->type) { + case EXPR_STRING: { + const char *s = expr->string->data; + LLVMValueRef indices[] = { LLVMConstInt(LLVMInt64Type(), 0, 0), LLVMConstInt(LLVMInt64Type(), 0, 0) }; + LLVMValueRef data; + + data = LLVMAddGlobal(fn->module, LLVMArrayType(LLVMInt8Type(), strlen(s) + 1), ".str"); + LLVMSetLinkage(data, LLVMPrivateLinkage); + LLVMSetGlobalConstant(data, 1); + LLVMSetInitializer(data, LLVMConstString(strdup(s), strlen(s) + 1, true)); + + result = LLVMConstGEP(data, indices, ARRAY_SIZE(indices)); + break; + } + case EXPR_SYMBOL: { + struct symbol *sym = expr->symbol; + + result = LLVMGetNamedGlobal(fn->module, show_ident(sym->ident)); + assert(result != NULL); + break; + } + default: + assert(0); + } + } else { + const char *name = show_ident(sym->ident); + LLVMTypeRef type = symbol_type(sym); + + if (LLVMGetTypeKind(type) == LLVMFunctionTypeKind) { + result = LLVMGetNamedFunction(fn->module, name); + if (!result) + result = LLVMAddFunction(fn->module, name, type); + } else { + result = LLVMGetNamedGlobal(fn->module, name); + if (!result) + result = LLVMAddGlobal(fn->module, type, name); + } + } + + return result; +} + static LLVMValueRef pseudo_to_value(struct function *fn, struct instruction *insn, pseudo_t pseudo) { LLVMValueRef result = NULL; @@ -313,54 +364,9 @@ static LLVMValueRef pseudo_to_value(struct function *fn, struct instruction *ins case PSEUDO_REG: result = pseudo->priv; break; - case PSEUDO_SYM: { - struct symbol *sym = pseudo->sym; - struct expression *expr; - - assert(sym->bb_target == NULL); - - expr = sym->initializer; - if (expr) { - switch (expr->type) { - case EXPR_STRING: { - const char *s = expr->string->data; - LLVMValueRef indices[] = { LLVMConstInt(LLVMInt64Type(), 0, 0), LLVMConstInt(LLVMInt64Type(), 0, 0) }; - LLVMValueRef data; - - data = LLVMAddGlobal(fn->module, LLVMArrayType(LLVMInt8Type(), strlen(s) + 1), ".str"); - LLVMSetLinkage(data, LLVMPrivateLinkage); - LLVMSetGlobalConstant(data, 1); - LLVMSetInitializer(data, LLVMConstString(strdup(s), strlen(s) + 1, true)); - - result = LLVMConstGEP(data, indices, ARRAY_SIZE(indices)); - break; - } - case EXPR_SYMBOL: { - struct symbol *sym = expr->symbol; - - result = LLVMGetNamedGlobal(fn->module, show_ident(sym->ident)); - assert(result != NULL); - break; - } - default: - assert(0); - } - } else { - const char *name = show_ident(sym->ident); - LLVMTypeRef type = symbol_type(sym); - - if (LLVMGetTypeKind(type) == LLVMFunctionTypeKind) { - result = LLVMGetNamedFunction(fn->module, name); - if (!result) - result = LLVMAddFunction(fn->module, name, type); - } else { - result = LLVMGetNamedGlobal(fn->module, name); - if (!result) - result = LLVMAddGlobal(fn->module, type, name); - } - } + case PSEUDO_SYM: + result = get_sym_value(fn, pseudo->sym); break; - } case PSEUDO_VAL: result = LLVMConstInt(insn_symbol_type(insn), pseudo->value, 1); break;