This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[patch] reload1.c: Remove ior_hard_reg_set.


Hi,

Attached is a patch to remove ior_hard_reg_set as it seems to be a
thing of the past.

The errors described immediately before ior_hard_reg_set occurred
probably because the code under EXECUTE_IF_SET_IN_REG_SET was compiled
as a part of the macro.

Now that EXECUTE_IF_SET_IN_REG_SET follows the iterator style, the
code under EXECUTE_IF_SET_IN_REG_SET is outside the macro, so we
should be able to use IOR_HARD_REG_SET directly.

Bootstrapped on i686-pc-linux-gnu.  Committed as obvious.

Kazu Hirata

2004-10-18  Kazu Hirata  <kazu@cs.umass.edu>

	* reload1.c (ior_hard_reg_set): Remove.
	(finish_spills): Use IOR_HARD_REG_SET instead of
	ior_hard_reg_set.

Index: reload1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/reload1.c,v
retrieving revision 1.450
diff -u -r1.450 reload1.c
--- reload1.c	18 Oct 2004 15:11:29 -0000	1.450
+++ reload1.c	18 Oct 2004 15:12:17 -0000
@@ -390,7 +390,6 @@
 static void update_eliminables (HARD_REG_SET *);
 static void spill_hard_reg (unsigned int, int);
 static int finish_spills (int);
-static void ior_hard_reg_set (HARD_REG_SET *, HARD_REG_SET *);
 static void scan_paradoxical_subregs (rtx);
 static void count_pseudo (int);
 static void order_regs_for_reload (struct insn_chain *);
@@ -3534,15 +3533,6 @@
       SET_REGNO_REG_SET (&spilled_pseudos, i);
 }
 
-/* I'm getting weird preprocessor errors if I use IOR_HARD_REG_SET
-   from within EXECUTE_IF_SET_IN_REG_SET.  Hence this awkwardness.  */
-
-static void
-ior_hard_reg_set (HARD_REG_SET *set1, HARD_REG_SET *set2)
-{
-  IOR_HARD_REG_SET (*set1, *set2);
-}
-
 /* After find_reload_regs has been run for all insn that need reloads,
    and/or spill_hard_regs was called, this function is used to actually
    spill pseudo registers and try to reallocate them.  It also sets up the
@@ -3607,14 +3597,14 @@
 	  EXECUTE_IF_SET_IN_REG_SET
 	    (&chain->live_throughout, FIRST_PSEUDO_REGISTER, i, rsi)
 	    {
-	      ior_hard_reg_set (pseudo_forbidden_regs + i,
-				&chain->used_spill_regs);
+	      IOR_HARD_REG_SET (pseudo_forbidden_regs[i],
+				chain->used_spill_regs);
 	    }
 	  EXECUTE_IF_SET_IN_REG_SET
 	    (&chain->dead_or_set, FIRST_PSEUDO_REGISTER, i, rsi)
 	    {
-	      ior_hard_reg_set (pseudo_forbidden_regs + i,
-				&chain->used_spill_regs);
+	      IOR_HARD_REG_SET (pseudo_forbidden_regs[i],
+				chain->used_spill_regs);
 	    }
 	}
 


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]