From patchwork Tue Jul 7 13:50:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew MacLeod X-Patchwork-Id: 492276 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7462D1402B3 for ; Tue, 7 Jul 2015 23:50:30 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=q6k7SgkT; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:subject:references :in-reply-to:content-type; q=dns; s=default; b=MwYv1fxcxeGui84cL K2p2nlXHR0KRuQ9q9qi9bhC5rz0eLkXpf4WvGLIyq7o81e2t/w6CAsBhoVGkVsYV sLC4vpjawvtGB/9viInoyj1klrg6Qyu/3s1o0dk6rZy+8dyMShsVrllQ0fQenHNN aaHkUg7/tVPydOZ0YGsx/vHIu0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:subject:references :in-reply-to:content-type; s=default; bh=CkV3dl5pDGHpRnQns3lzjk8 k5FU=; b=q6k7SgkTCDvp+3Xwcansft4JK69q0uplr0Rvu7BCbU96Vseh2bUFzUv 7s6rMP6mpiolkyWhS1RYNXPdBj9OgF4F2NVcE6aDcu1QYox3ErUlYsihNt8ysw9Z g1OX1FVscrYiO3at7yOknqRLW915X0h2fSZek6SdqoEqEmKOmj2U= Received: (qmail 85293 invoked by alias); 7 Jul 2015 13:50:23 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 85284 invoked by uid 89); 7 Jul 2015 13:50:23 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.8 required=5.0 tests=AWL, BAYES_50, KAM_ASCII_DIVIDERS, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=no version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 07 Jul 2015 13:50:22 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 268B83173CC for ; Tue, 7 Jul 2015 13:50:21 +0000 (UTC) Received: from [10.10.63.37] (vpn-63-37.rdu2.redhat.com [10.10.63.37]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t67DoJ7n029407 for ; Tue, 7 Jul 2015 09:50:20 -0400 Message-ID: <559BD91B.2010300@redhat.com> Date: Tue, 07 Jul 2015 09:50:19 -0400 From: Andrew MacLeod User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: gcc-patches@gcc.gnu.org Subject: [patch 8/9] Flatten df.h References: <559BD6B3.2080207@redhat.com> In-Reply-To: <559BD6B3.2080207@redhat.com> X-IsSubscribed: yes This patch fixes up df.h. It contains 5 headers that will form part of backend.has well as hard-reg-set.h which is now going to be included by rtl.h. The other 3 includes are required for df.h to compile, and it makes sense to leave them here. furthermore, resource.h, sched-int.h and valtrack.h all include df.h, amongst other things, so flatten them as well. Now only source files will include df.h and we can see if it may belong in some other aggregator (or even become one) after include reduction. All the requisite adjustments to source files will be in the final patch. Bootstraps from scratch on x86_64-unknown-linux-gnu with no new regressions. Also compiles all the files in config-list.mk. * resource.h: Flatten hard-reg-set.h and df.h. * sched-int.h: Flatten insn-arrt.h and df.h. * valtrack.h: flatten bitmap.h, df.h, and rtl.h * df.h: Flatten includes, leaving regset.h, alloc-pool.h and timevar.h. Index: resource.h =================================================================== *** resource.h (revision 225452) --- resource.h (working copy) *************** along with GCC; see the file COPYING3. *** 20,28 **** #ifndef GCC_RESOURCE_H #define GCC_RESOURCE_H - #include "hard-reg-set.h" - #include "df.h" - /* Macro to clear all resources. */ #define CLEAR_RESOURCE(RES) \ do { (RES)->memory = (RES)->volatil = (RES)->cc = 0; \ --- 20,25 ---- Index: sched-int.h =================================================================== *** sched-int.h (revision 225452) --- sched-int.h (working copy) *************** along with GCC; see the file COPYING3. *** 21,32 **** #ifndef GCC_SCHED_INT_H #define GCC_SCHED_INT_H - #include "insn-attr.h" - #ifdef INSN_SCHEDULING - #include "df.h" - /* Identificator of a scheduler pass. */ enum sched_pass_id_t { SCHED_PASS_UNKNOWN, SCHED_RGN_PASS, SCHED_EBB_PASS, SCHED_SMS_PASS, SCHED_SEL_PASS }; --- 21,28 ---- Index: valtrack.h =================================================================== *** valtrack.h (revision 225452) --- valtrack.h (working copy) *************** along with GCC; see the file COPYING3. *** 22,31 **** #ifndef GCC_VALTRACK_H #define GCC_VALTRACK_H - #include "bitmap.h" - #include "df.h" - #include "rtl.h" - /* Debug uses of dead regs. */ /* Entry that maps a dead pseudo (REG) used in a debug insns that dies --- 22,27 ---- Index: df.h =================================================================== *** df.h (revision 225452) --- df.h (working copy) *************** along with GCC; see the file COPYING3. *** 25,37 **** #ifndef GCC_DF_H #define GCC_DF_H - #include "bitmap.h" #include "regset.h" - #include "sbitmap.h" - #include "predict.h" - #include "tm.h" - #include "hard-reg-set.h" - #include "function.h" #include "alloc-pool.h" #include "timevar.h" --- 25,31 ----