From patchwork Tue Mar 21 00:15:25 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: 9635681 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 B2E61601E9 for ; Tue, 21 Mar 2017 00:16:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A578C26E4F for ; Tue, 21 Mar 2017 00:16:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A4DF275A2; Tue, 21 Mar 2017 00:16:44 +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 3EC5026E4F for ; Tue, 21 Mar 2017 00:16:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755928AbdCUAQo (ORCPT ); Mon, 20 Mar 2017 20:16:44 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:34308 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755901AbdCUAQn (ORCPT ); Mon, 20 Mar 2017 20:16:43 -0400 Received: by mail-wr0-f195.google.com with SMTP id u48so20449467wrc.1 for ; Mon, 20 Mar 2017 17:16:42 -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=WCO5dZAFOCT3QeaaCVa+w/35qURSEGtFtU6/kUj4TtugbxYl2qdxKSpW8op4f8P6o3 qQHii20S3o4BoMTTVj9qI8IWGxy+pskq8ifjNl40rT6HN3XOyaL0pDrV5/bcbU0Bws7M QESql08Kx5rNkt8LcUwdk1ebSRJUlOmgb3qJv0piJzViaFwNCF+J0i0/ecqA2MhmUGnI bGMssHkuh2VF1hHp/nWWOYvwvxC7Al7kkQcwYnJXJJybPK5dch5B7zFmFBGPWV+d0tSP CfRg87OepI6Bf4vC+9+IDJwTL9MYfLZFE/c+8W1Ry4Li5jNZ7VwT4JqwIRO+okQroirc d5eg== 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=DO55Fjyfwaz85i8Dy7YHVm9fMbIY5unhV3mcahdDmfkm65E3fe3ou8+vBsEyaFNptz VMNgDJ9OuY+wwFQWsa5r+4E1dV6ndt6TiVhIl24ScLFK6/MEd8d7Uk+gQf0o6QvLkzNJ 4phkFripTh4BRU1nnD4C60Y5zzsuyYRFPmbyOjD0TWClmYmNuYl+bQ7Ektl3moJxw1jj wjoswQ/Cx6TgsR1c9N5d4VC3WEaHPJI3vw89n/HXbsonk0hUQGpri939UAhKVHYnE3le E4GSgYA9mcCWbeu0a86jfZuC2g2eN0YCYUiqh/87nGOzWi9zasXO9cvVnb0WRuH72nlV K13w== X-Gm-Message-State: AFeK/H26T7o9+11hAdjQjcDwX7rp9v8HFw8E/qEjUMI/7qGuskLcEAEMihW2lIFwcpv6KQ== X-Received: by 10.223.131.133 with SMTP id 5mr22509840wre.183.1490055401803; Mon, 20 Mar 2017 17:16:41 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:8b8:5c00:403a:a805:fd41:37d2]) by smtp.gmail.com with ESMTPSA id t195sm15271172wmt.32.2017.03.20.17.16.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Mar 2017 17:16:41 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Dibyendu Majumdar , Jeff Garzik , Pekka Enberg , Luc Van Oostenryck Subject: [PATCH v4 21/63] llvm: extract get_sym_value() from pseudo_to_value() Date: Tue, 21 Mar 2017 01:15:25 +0100 Message-Id: <20170321001607.75169-22-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170321001607.75169-1-luc.vanoostenryck@gmail.com> References: <20170321001607.75169-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;