From patchwork Fri Jul 7 13:39:59 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: 9830481 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 0D61A60352 for ; Fri, 7 Jul 2017 13:50:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 014242868B for ; Fri, 7 Jul 2017 13:50:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA1E528697; Fri, 7 Jul 2017 13:50:35 +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 7AA8128699 for ; Fri, 7 Jul 2017 13:50:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752491AbdGGNkx (ORCPT ); Fri, 7 Jul 2017 09:40:53 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:35852 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752823AbdGGNkt (ORCPT ); Fri, 7 Jul 2017 09:40:49 -0400 Received: by mail-lf0-f65.google.com with SMTP id f28so4001321lfi.3 for ; Fri, 07 Jul 2017 06:40:48 -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=3SJ3DtEtCvm9aikgVGPOaKh0BpxvWD0l1BkJHG5gXMc=; b=UuG9S61SoRsuNfmdXlpEsYiNkCprlqWl+/xGRKnI/kgTVaife2RR7jyipULTiYpjDw s8TtsTSrRvAfZc3D7pjaUaRePQKMrjTeC+p5Mhj8RJ1TPSm2FOi4GPmJULymE4cTzga6 djYIFMnb7kSzE4AyPTNgVJXXs2NuAmJcpubSkM7FY3RZnL2VhVypTxTlT0K7eNjrZwHv I38CpO11M0y59mdDAdu4sVoItzlQ0j2mFNtZJr/VLUjivDUV+a32s+ZaO4LYL+Mt0gE1 eQFaHMDLfWQIwPGylaqwuQbQZnvUwdpqZ7RKzPoMcugqA9s3mJqGtZ0aE1HHa5JCDi1w 7l+Q== 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=3SJ3DtEtCvm9aikgVGPOaKh0BpxvWD0l1BkJHG5gXMc=; b=Embh8YyKry3Y7WkHzfnZCdTN65vbPcjkPyiTuOAvSA4JbjaeFxNuy3evTATq/4EN4F z95QbbT8j+o04Gs6yrBbbWgMYnAm2WylmUQXqI/RZb4sbdk5S7pGbOaBsHtL8dXpRxNv FvPOhBSw0fKttFBDFFISdoxDToaMSCave/3Tob0/Tfmb0HK3hMgtIYJ5BK4oJu9Z3W2e 8Be2vvqeoKDOI6RRhUzbvIQw8QL0hnEfS0gMeTeBGVhC005SvVBoMmj0catjLdMjjxXE oDbEvNbbkxKIihsqoM9hWPcEsuitTbkp4X+/OLF2vX4vonnQA/iVx/CpqaOJqBvwhg8v fkwA== X-Gm-Message-State: AIVw113g3ubsNGtWBnK/mAjmnbZP0q+6yYyQovft6inI7j/NahDLoFLf rFdU6JPDnyoJjdhSu60= X-Received: by 10.80.149.133 with SMTP id w5mr2356898eda.82.1499434842139; Fri, 07 Jul 2017 06:40:42 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:8ed:9a00:3d4d:9b95:75f7:a8db]) by smtp.gmail.com with ESMTPSA id e28sm1899277ede.14.2017.07.07.06.40.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Jul 2017 06:40:41 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Linus Torvalds , Luc Van Oostenryck Subject: [PATCH 31/34] ptrlist: explicitely tagged Date: Fri, 7 Jul 2017 15:39:59 +0200 Message-Id: <20170707134002.49500-32-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170707134002.49500-1-luc.vanoostenryck@gmail.com> References: <20170707134002.49500-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 --- example.c | 20 ++++++++++---------- ptrlist.h | 4 ++++ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/example.c b/example.c index 691e0f97c..41ee712fe 100644 --- a/example.c +++ b/example.c @@ -394,7 +394,7 @@ static void flush_reg(struct bb_state *state, struct hardreg *reg) return; reg->dead = 0; reg->used = 1; - FOR_EACH_PTR(reg->contains, pseudo) { + FOR_EACH_TAGGED_PTR(reg->contains, pseudo) { if (CURRENT_TAG(pseudo) & TAG_DEAD) continue; if (!(CURRENT_TAG(pseudo) & TAG_DIRTY)) @@ -447,7 +447,7 @@ static void mark_reg_dead(struct bb_state *state, pseudo_t pseudo, struct hardre { pseudo_t p; - FOR_EACH_PTR(reg->contains, p) { + FOR_EACH_TAGGED_PTR(reg->contains, p) { if (p != pseudo) continue; if (CURRENT_TAG(p) & TAG_DEAD) @@ -532,7 +532,7 @@ static struct hardreg *find_in_reg(struct bb_state *state, pseudo_t pseudo) pseudo_t p; reg = hardregs + i; - FOR_EACH_PTR(reg->contains, p) { + FOR_EACH_TAGGED_PTR(reg->contains, p) { if (p == pseudo) { last_reg = i; output_comment(state, "found pseudo %s in reg %s (busy=%d)", show_pseudo(pseudo), reg->name, reg->busy); @@ -872,7 +872,7 @@ static void kill_dead_reg(struct hardreg *reg) if (reg->dead) { pseudo_t p; - FOR_EACH_PTR(reg->contains, p) { + FOR_EACH_TAGGED_PTR(reg->contains, p) { if (CURRENT_TAG(p) & TAG_DEAD) { DELETE_CURRENT_PTR(p); reg->dead--; @@ -912,7 +912,7 @@ static void generate_binop(struct bb_state *state, struct instruction *insn) static int is_dead_reg(struct bb_state *state, pseudo_t pseudo, struct hardreg *reg) { pseudo_t p; - FOR_EACH_PTR(reg->contains, p) { + FOR_EACH_TAGGED_PTR(reg->contains, p) { if (p == pseudo) return CURRENT_TAG(p) & TAG_DEAD; } END_FOR_EACH_PTR(p); @@ -1007,7 +1007,7 @@ static void kill_pseudo(struct bb_state *state, pseudo_t pseudo) pseudo_t p; reg = hardregs + i; - FOR_EACH_PTR(reg->contains, p) { + FOR_EACH_TAGGED_PTR(reg->contains, p) { if (p != pseudo) continue; if (CURRENT_TAG(p) & TAG_DEAD) @@ -1544,7 +1544,7 @@ static void fill_output(struct bb_state *state, pseudo_t pseudo, struct storage struct hardreg *reg = hardregs + i; pseudo_t p; - FOR_EACH_PTR(reg->contains, p) { + FOR_EACH_TAGGED_PTR(reg->contains, p) { if (p == pseudo) { write_reg_to_storage(state, reg, pseudo, out); return; @@ -1652,7 +1652,7 @@ static void generate_output_storage(struct bb_state *state) int flushme = 0; reg->busy = REG_FIXED; - FOR_EACH_PTR(reg->contains, p) { + FOR_EACH_TAGGED_PTR(reg->contains, p) { if (p == entry->pseudo) { flushme = -100; continue; @@ -1949,9 +1949,9 @@ int main(int argc, char **argv) compile(sparse_initialize(argc, argv, &filelist)); dbg_dead = 1; - FOR_EACH_PTR_NOTAG(filelist, file) { + FOR_EACH_PTR(filelist, file) { compile(sparse(file)); - } END_FOR_EACH_PTR_NOTAG(file); + } END_FOR_EACH_PTR(file); return 0; } diff --git a/ptrlist.h b/ptrlist.h index 9e16adb36..1a0d7225c 100644 --- a/ptrlist.h +++ b/ptrlist.h @@ -190,6 +190,10 @@ do { \ #define FOR_EACH_PTR(head, ptr) \ DO_FOR_EACH(head, ptr, __cur##ptr, CUR_ENTRY) +#define FOR_EACH_TAGGED_PTR(head, ptr) \ + FOR_EACH_PTR(head, ptr) \ + ptr = __PTR_STRIP_TAG(ptr); + #define END_FOR_EACH_PTR(ptr) \ DO_END_FOR_EACH(ptr, __cur##ptr)