From patchwork Mon Mar 27 21:23:55 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: 9647517 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 E01CE601D7 for ; Mon, 27 Mar 2017 21:26:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF9141FE84 for ; Mon, 27 Mar 2017 21:26:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C2C19205FC; Mon, 27 Mar 2017 21:26:58 +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 687C51FE84 for ; Mon, 27 Mar 2017 21:26:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752580AbdC0V05 (ORCPT ); Mon, 27 Mar 2017 17:26:57 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:33864 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751739AbdC0V04 (ORCPT ); Mon, 27 Mar 2017 17:26:56 -0400 Received: by mail-wr0-f194.google.com with SMTP id w43so14204645wrb.1 for ; Mon, 27 Mar 2017 14:26:55 -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=+kjOQ1vvCGhrLJeKhMPeXhH6ejTxoEdSrcbnELLPhSw=; b=Fqo1KA7bQXbifpiaoaT8lL9ZhHt+dK9gqtD5hU3MBQBv2sjb6zLpZGNR2Me6AadaGQ CI5rvPfjXfLmw+Qpjz+1pVmkRvjeKD+VOfKAR5SvVQpa4L5mNbrLiZdAQ7nWt5sVEGLv FswB2n/o9IslJcJAoyAW1M0SCb6pkdtQkBPpcCrYgHqUTynvGwtwsLlJxhhrDaPaDS4Y pdZkOhtlSnN74LAXKahn7mtwpsQ7LX8GSZ1HkiO03QBZWrcZSOvO/p8894o8YWH/eYkv Si5XkzRy1O/V18h/RDux4Wi2gDx5htHoWbE2ZLh30bOmN1KKCZlrYN6Gb7aJDPECtlPL 5CSw== 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=+kjOQ1vvCGhrLJeKhMPeXhH6ejTxoEdSrcbnELLPhSw=; b=NjxwDGEf1QxKdvgvspNbntkJgtILcmvKCD+Tp2+I5SZHp6bK+VkuPrBBq3FaoVe9eI VhHA9mL8wtZbDOlIc/0LfDHy5Rrfn1rDw29N7g9sCL20+qlFWrBS5YXJamkqLDxxXRML 0Tz4G+U2BeaHg+AmWx/xj88faT3CJubHNiNbQJWbO8Jd/l3Mo3XDmoN5hggnVXnxryB2 /BFwjI0lhAgxA0kieHiOQdYcVMQzsUBYvRqsMZd5llC9hhJSgBQqHw8ymvwCJUH4kDEW Ubya9tlgGM7J3Yc8EufuKUz/LrLzzM4+YN/os0mMA81G75nws6jaRQesHkjcj4DpaEya oiEQ== X-Gm-Message-State: AFeK/H1oDJbnj7lRd+1hilIpXfx0dkl+p/F+Zx0Fz4oItuPSsm6t89s2w8r+L6K0MfwQFA== X-Received: by 10.223.177.151 with SMTP id q23mr21506000wra.65.1490650014585; Mon, 27 Mar 2017 14:26:54 -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.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Mar 2017 14:26:54 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Luc Van Oostenryck Subject: [PATCH v6 31/52] llvm: add support for OP_SWITCH with a range Date: Mon, 27 Mar 2017 23:23:55 +0200 Message-Id: <20170327212416.18536-32-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 | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/sparse-llvm.c b/sparse-llvm.c index 3c7b669fe..5b25bb0c1 100644 --- a/sparse-llvm.c +++ b/sparse-llvm.c @@ -760,10 +760,8 @@ static void output_op_switch(struct function *fn, struct instruction *insn) int n_jmp = 0; FOR_EACH_PTR(insn->multijmp_list, jmp) { - if (jmp->begin == jmp->end) { /* case N */ - n_jmp++; - } else if (jmp->begin < jmp->end) { /* case M..N */ - assert(0); + if (jmp->begin <= jmp->end) { + n_jmp += (jmp->end - jmp->begin) + 1; } else /* default case */ def = jmp->target; } END_FOR_EACH_PTR(jmp); @@ -773,12 +771,11 @@ static void output_op_switch(struct function *fn, struct instruction *insn) def ? def->priv : NULL, n_jmp); FOR_EACH_PTR(insn->multijmp_list, jmp) { - if (jmp->begin == jmp->end) { /* case N */ - LLVMAddCase(target, - val_to_value(jmp->begin, insn->type), - jmp->target->priv); - } else if (jmp->begin < jmp->end) { /* case M..N */ - assert(0); + long val; + + for (val = jmp->begin; val <= jmp->end; val++) { + LLVMValueRef Val = val_to_value(val, insn->type); + LLVMAddCase(target, Val, jmp->target->priv); } } END_FOR_EACH_PTR(jmp);