From patchwork Fri Mar 24 23:14:21 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: 9644141 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 3563960328 for ; Fri, 24 Mar 2017 23:14:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 273FC200E9 for ; Fri, 24 Mar 2017 23:14:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C38026E81; Fri, 24 Mar 2017 23:14:46 +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 B159426E4F for ; Fri, 24 Mar 2017 23:14:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935171AbdCXXOp (ORCPT ); Fri, 24 Mar 2017 19:14:45 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:36744 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934140AbdCXXOn (ORCPT ); Fri, 24 Mar 2017 19:14:43 -0400 Received: by mail-wr0-f194.google.com with SMTP id u1so579327wra.3 for ; Fri, 24 Mar 2017 16:14: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=MuoZZMgn/jP02ZFy0tHdJiwKxCJp7oLtggtls4NHyrA=; b=OljAIMg6Pw5Dg8gaNg2+YBrcmf5Sdq++9yk6X7OWN6D8VYoG4FycjdUFdu8aUznP62 zDODEnQaYMuWZUKsyP2AbJLkQ+PFVvtB7eGPI7uRkUTKuYDAeu6nxcIfIsoBmTaGx7iw BWhPxmIRA15KTZZ1z9ZfR2B0LJWcZva0P66dKUmmxssnBBRSbTrIN4tpBMrngfbm0bRq 4DlKekQZkFI4BTDnEMzuowjbBTtbSdhfUM6f+dYk0HYvM1TSgTa7hVOVyffrFWSqAGmn PXPmIX2kfUkglLZ4670Q+K+SP9vEFTKe5qODW5HRYx8yqmH96Zm5XNYyUrmHcnC2xEFr L/Gg== 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=MuoZZMgn/jP02ZFy0tHdJiwKxCJp7oLtggtls4NHyrA=; b=AILNussHlFhpZjhXifrVLGmwDqIpV3KqXzGO//NqTfP/8C2OU92GJ0H3yJLDD4v45X YFrn5xoEBeyEzb0s4pmmdv+lEuZHNuzyHv0iOJQhG/1XId5sib2HffN+13ML9/pz1GYK sP01oeEtsMYoKeEbJu0gcazsKkmY1kdoT/90dTw/IJm7YffVsZmm/KAKXMUNVKv70+ui +HBKhjZVQYw+9ilKFvVuL+4KIsDSM68qoyO+ozrjA9fWBOynMqxQTyX/dH3s6WnqcHEp GIl9/21MfsgJMUyC0FJVjjArigrZVHvqJCChhtW45wE8Ul3MRKwoMLe0hPFL/ZTaCgKg efqw== X-Gm-Message-State: AFeK/H33fCoInK79td8dkKXbVnBn3NAvqHCvaxo7DsoRtb2txc0qhtqzrfy++xQ+0WpAFA== X-Received: by 10.223.173.82 with SMTP id p76mr9051019wrc.137.1490397281604; Fri, 24 Mar 2017 16:14:41 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:802:b00:81c3:4cc:f845:762c]) by smtp.gmail.com with ESMTPSA id m188sm4160876wma.27.2017.03.24.16.14.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Mar 2017 16:14:41 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Luc Van Oostenryck Subject: [PATCH v5 14/14] add support for wider type in switch-case Date: Sat, 25 Mar 2017 00:14:21 +0100 Message-Id: <20170324231421.14869-15-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170324231421.14869-1-luc.vanoostenryck@gmail.com> References: <20170324231421.14869-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 Currently the different cases of a switch-statement, or more exactly the 'struct multijmp' that hold the value of these cases excepted only value of 'int' type. Trying to use a wider value results in the value being truncated but any integer value should be valid. Fix this by unsigned 'long long' to hold these values. Signed-off-by: Luc Van Oostenryck --- linearize.c | 8 ++++---- linearize.h | 2 +- validation/switch-long.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 validation/switch-long.c diff --git a/linearize.c b/linearize.c index 73599798f..7bef5a251 100644 --- a/linearize.c +++ b/linearize.c @@ -77,7 +77,7 @@ static struct basic_block *alloc_basic_block(struct entrypoint *ep, struct posit return bb; } -static struct multijmp *alloc_multijmp(struct basic_block *target, int begin, int end) +static struct multijmp *alloc_multijmp(struct basic_block *target, long long begin, long long end) { struct multijmp *multijmp = __alloc_multijmp(0); multijmp->target = target; @@ -366,9 +366,9 @@ const char *show_instruction(struct instruction *insn) buf += sprintf(buf, "%s", show_pseudo(insn->cond)); FOR_EACH_PTR(insn->multijmp_list, jmp) { if (jmp->begin == jmp->end) - buf += sprintf(buf, ", %d -> .L%u", jmp->begin, jmp->target->nr); + buf += sprintf(buf, ", %lld -> .L%u", jmp->begin, jmp->target->nr); else if (jmp->begin < jmp->end) - buf += sprintf(buf, ", %d ... %d -> .L%u", jmp->begin, jmp->end, jmp->target->nr); + buf += sprintf(buf, ", %lld ... %lld -> .L%u", jmp->begin, jmp->end, jmp->target->nr); else buf += sprintf(buf, ", default -> .L%u", jmp->target->nr); } END_FOR_EACH_PTR(jmp); @@ -1938,7 +1938,7 @@ static pseudo_t linearize_switch(struct entrypoint *ep, struct statement *stmt) default_case = bb_case; continue; } else { - int begin, end; + long long begin, end; begin = end = case_stmt->case_expression->value; if (case_stmt->case_to) diff --git a/linearize.h b/linearize.h index d437e268d..f0e76c098 100644 --- a/linearize.h +++ b/linearize.h @@ -47,7 +47,7 @@ extern struct pseudo void_pseudo; struct multijmp { struct basic_block *target; - int begin, end; + long long begin, end; }; struct asm_constraint { diff --git a/validation/switch-long.c b/validation/switch-long.c new file mode 100644 index 000000000..5bfdb4397 --- /dev/null +++ b/validation/switch-long.c @@ -0,0 +1,47 @@ +void def(void); +void r0(void); +void r1(void); + +void sw_long(long long a) +{ + switch (a) { + case 0: return r0(); + case 1LL << 00: return r1(); + case 1LL << 32: return r1(); + } + + return def(); +} + +/* + * check-name: switch-long + * check-command: test-linearize -Wno-decl $file + * + * check-output-start +sw_long: +.L0: + + switch.64 %arg1, 0 -> .L2, 1 -> .L3, 4294967296 -> .L4, default -> .L1 + +.L2: + call r0 + br .L5 + +.L3: + call r1 + br .L5 + +.L4: + call r1 + br .L5 + +.L1: + call def + br .L5 + +.L5: + ret + + + * check-output-end + */