This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: C++ bootstrap (part 12/n): Import enum cpp_ttype.
- From: Joern Rennecke <joern dot rennecke at superh dot com>
- To: zack at codesourcery dot com (Zack Weinberg)
- Cc: joern dot rennecke at superh dot com (Joern Rennecke), bernie at develer dot com (Bernardo Innocenti), gcc-patches at gcc dot gnu dot org (GCC Patches)
- Date: Mon, 26 Jul 2004 17:16:35 +0100 (BST)
- Subject: Re: C++ bootstrap (part 12/n): Import enum cpp_ttype.
>
> Joern Rennecke <joern.rennecke@superh.com> writes:
>
> > sh.c includes ra.h - for the hard_regs_intersect_p prototype - as well as
> > c-pragma.h .
> >
> > ra.h defines enum node_type in a different manner than does cpplib.h .
>
> So rename one of them.
I'm currently bootstrapping this on i686-pc-linux-gnu:
2004-07-26 J"orn Rennecke <joern.rennecke@superh.com>
* ra.h (enum node_type): Rename to:
(enum ra_node_type).
* ra-colorize.c: Likewise.
Index: ra.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ra.h,v
retrieving revision 1.11
diff -p -r1.11 ra.h
*** ra.h 3 Jun 2004 15:01:08 -0000 1.11
--- ra.h 26 Jul 2004 16:06:10 -0000
*************** struct dlist
*** 43,49 ****
#define DLIST_MOVE(l) ((l)->value.move)
/* Classification of a given node (i.e. what state it's in). */
! enum node_type
{
INITIAL = 0, FREE,
PRECOLORED,
--- 43,49 ----
#define DLIST_MOVE(l) ((l)->value.move)
/* Classification of a given node (i.e. what state it's in). */
! enum ra_node_type
{
INITIAL = 0, FREE,
PRECOLORED,
*************** struct web
*** 214,220 ****
unsigned int have_orig_conflicts:1;
/* Current state of the node. */
! ENUM_BITFIELD(node_type) type:5;
/* A regclass, combined from preferred and alternate class, or calculated
from usable_regs. Used only for debugging, and to determine
--- 214,220 ----
unsigned int have_orig_conflicts:1;
/* Current state of the node. */
! ENUM_BITFIELD(ra_node_type) type:5;
/* A regclass, combined from preferred and alternate class, or calculated
from usable_regs. Used only for debugging, and to determine
*************** extern struct dlist * pop_list (struct d
*** 623,629 ****
extern void record_conflict (struct web *, struct web *);
extern int memref_is_stack_slot (rtx);
extern void build_i_graph (struct df *);
! extern void put_web (struct web *, enum node_type);
extern void remove_web_from_list (struct web *);
extern void reset_lists (void);
extern struct web * alias (struct web *);
--- 623,629 ----
extern void record_conflict (struct web *, struct web *);
extern int memref_is_stack_slot (rtx);
extern void build_i_graph (struct df *);
! extern void put_web (struct web *, enum ra_node_type);
extern void remove_web_from_list (struct web *);
extern void reset_lists (void);
extern struct web * alias (struct web *);
Index: ra-colorize.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ra-colorize.c,v
retrieving revision 1.18
diff -p -r1.18 ra-colorize.c
*** ra-colorize.c 15 Mar 2004 18:20:39 -0000 1.18
--- ra-colorize.c 26 Jul 2004 16:06:10 -0000
***************
*** 50,56 ****
static void push_list (struct dlist *, struct dlist **);
static void push_list_end (struct dlist *, struct dlist **);
static void free_dlist (struct dlist **);
! static void put_web_at_end (struct web *, enum node_type);
static void put_move (struct move *, enum move_type);
static void build_worklists (struct df *);
static void enable_move (struct web *);
--- 50,56 ----
static void push_list (struct dlist *, struct dlist **);
static void push_list_end (struct dlist *, struct dlist **);
static void free_dlist (struct dlist **);
! static void put_web_at_end (struct web *, enum ra_node_type);
static void put_move (struct move *, enum move_type);
static void build_worklists (struct df *);
static void enable_move (struct web *);
*************** static void remove_move (struct web *, s
*** 61,67 ****
static void add_worklist (struct web *);
static int ok (struct web *, struct web *);
static int conservative (struct web *, struct web *);
! static inline unsigned int simplify_p (enum node_type);
static void combine (struct web *, struct web *);
static void coalesce (void);
static void freeze_moves (struct web *);
--- 61,67 ----
static void add_worklist (struct web *);
static int ok (struct web *, struct web *);
static int conservative (struct web *, struct web *);
! static inline unsigned int simplify_p (enum ra_node_type);
static void combine (struct web *, struct web *);
static void coalesce (void);
static void freeze_moves (struct web *);
*************** free_dlist (struct dlist **list)
*** 168,174 ****
Inline, because it's called with constant TYPE every time. */
inline void
! put_web (struct web *web, enum node_type type)
{
switch (type)
{
--- 168,174 ----
Inline, because it's called with constant TYPE every time. */
inline void
! put_web (struct web *web, enum ra_node_type type)
{
switch (type)
{
*************** reset_lists (void)
*** 260,266 ****
list. Additionally TYPE may not be SIMPLIFY. */
static void
! put_web_at_end (struct web *web, enum node_type type)
{
if (type == PRECOLORED)
type = INITIAL;
--- 260,266 ----
list. Additionally TYPE may not be SIMPLIFY. */
static void
! put_web_at_end (struct web *web, enum ra_node_type type)
{
if (type == PRECOLORED)
type = INITIAL;
*************** alias (struct web *web)
*** 683,689 ****
SIMPLIFY types. */
static inline unsigned int
! simplify_p (enum node_type type)
{
return type == SIMPLIFY || type == SIMPLIFY_SPILL || type == SIMPLIFY_FAT;
}
--- 683,689 ----
SIMPLIFY types. */
static inline unsigned int
! simplify_p (enum ra_node_type type)
{
return type == SIMPLIFY || type == SIMPLIFY_SPILL || type == SIMPLIFY_FAT;
}