[Patch] Remove call_fixed_regs

Anatoly Sokolov aesok@post.ru
Mon Aug 31 23:20:00 GMT 2009


Hi.

  The char array call_fixed_regs and HARD_REG_SET call_fixed_reg_set contain
the same information. This patch remove call_fixed_regs.

        * hard-reg-set.h (call_fixed_regs): Remove.
        * reginfo.c (call_fixed_regs): Remove.
        (init_reg_sets_1): Remove initialization of call_fixed_regs.
        (globalize_reg): Don't use call_fixed_regs.
        * caller-save.c (init_caller_save): Use call_fixed_reg_set instead of
        call_fixed_regs.

  Bootstrapped and regression tested on x86_64-unknown-linux-gnu,
ia64-unknown-linux-gnu and powerpc-unknown-linux-gnu targets.

Ok for apply?

Index: gcc/caller-save.c
===================================================================
--- gcc/caller-save.c   (revision 151243)
+++ gcc/caller-save.c   (working copy)
@@ -211,7 +211,8 @@
 
   for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
     {
-      if (call_used_regs[i] && ! call_fixed_regs[i])
+      if (call_used_regs[i]
+          && !TEST_HARD_REG_BIT (call_fixed_reg_set, i))
        {
          for (j = 1; j <= MOVE_MAX_WORDS; j++)
            {
@@ -219,7 +220,6 @@
                                                                   VOIDmode);
              if (regno_save_mode[i][j] == VOIDmode && j == 1)
                {
-                 call_fixed_regs[i] = 1;
                  SET_HARD_REG_BIT (call_fixed_reg_set, i);
                }
            }
@@ -287,7 +287,6 @@
          regno_save_mode[i][j] = VOIDmode;
          if (j == 1)
            {
-             call_fixed_regs[i] = 1;
              SET_HARD_REG_BIT (call_fixed_reg_set, i);
              if (call_used_regs[i])
                SET_HARD_REG_BIT (no_caller_save_reg_set, i);
Index: gcc/hard-reg-set.h
===================================================================
--- gcc/hard-reg-set.h  (revision 151243)
+++ gcc/hard-reg-set.h  (working copy)
@@ -600,17 +600,12 @@
 /* The same info as a HARD_REG_SET.  */
 
 extern HARD_REG_SET call_used_reg_set;
-  
-/* Indexed by hard register number, contains 1 for registers that are
-   fixed use -- i.e. in fixed_regs -- or a function value return register
-   or TARGET_STRUCT_VALUE_RTX or STATIC_CHAIN_REGNUM.  These are the
-   registers that cannot hold quantities across calls even if we are
-   willing to save and restore them.  */
 
-extern char call_fixed_regs[FIRST_PSEUDO_REGISTER];
+/* Contains 1 for registers that are fixed use -- i.e. in fixed_regs -- or
+   a function value return register or TARGET_STRUCT_VALUE_RTX or
+   STATIC_CHAIN_REGNUM.  These are the registers that cannot hold quantities
+   across calls even if we are willing to save and restore them.  */
 
-/* The same info as a HARD_REG_SET.  */
-
 extern HARD_REG_SET call_fixed_reg_set;
 
 /* Indexed by hard register number, contains 1 for registers
Index: gcc/reginfo.c
===================================================================
--- gcc/reginfo.c       (revision 151243)
+++ gcc/reginfo.c       (working copy)
@@ -101,13 +101,11 @@
 #endif
 
 
-/* Indexed by hard register number, contains 1 for registers that are
-   fixed use or call used registers that cannot hold quantities across
-   calls even if we are willing to save and restore them.  call fixed
-   registers are a subset of call used registers.  */
-char call_fixed_regs[FIRST_PSEUDO_REGISTER];
+/* Contains 1 for registers that are fixed use -- i.e. in fixed_regs -- or
+   a function value return register or TARGET_STRUCT_VALUE_RTX or
+   STATIC_CHAIN_REGNUM.  These are the registers that cannot hold quantities
+   across calls even if we are willing to save and restore them.  */
 
-/* The same info as a HARD_REG_SET.  */
 HARD_REG_SET call_fixed_reg_set;
 
 /* Indexed by hard register number, contains 1 for registers
@@ -515,8 +513,6 @@
   else
     CLEAR_REG_SET (regs_invalidated_by_call_regset);
 
-  memcpy (call_fixed_regs, fixed_regs, sizeof call_fixed_regs);
-
   for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
     {
       /* call_used_regs must include fixed_regs.  */
@@ -531,8 +527,6 @@
 
       if (call_used_regs[i])
        SET_HARD_REG_BIT (call_used_reg_set, i);
-      if (call_fixed_regs[i])
-       SET_HARD_REG_BIT (call_fixed_reg_set, i);
 
       /* There are a couple of fixed registers that we know are safe to
         exclude from being clobbered by calls:
@@ -571,12 +565,14 @@
         }
     }
 
+  COPY_HARD_REG_SET(call_fixed_reg_set, fixed_reg_set);
+
   /* Preserve global registers if called more than once.  */
   for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
     {
       if (global_regs[i])
        {
-         fixed_regs[i] = call_used_regs[i] = call_fixed_regs[i] = 1;
+         fixed_regs[i] = call_used_regs[i] = 1;
          SET_HARD_REG_BIT (fixed_reg_set, i);
          SET_HARD_REG_BIT (call_used_reg_set, i);
          SET_HARD_REG_BIT (call_fixed_reg_set, i);
@@ -870,7 +866,7 @@
   if (fixed_regs[i])
     return;
 
-  fixed_regs[i] = call_used_regs[i] = call_fixed_regs[i] = 1;
+  fixed_regs[i] = call_used_regs[i] = 1;
 #ifdef CALL_REALLY_USED_REGISTERS
   call_really_used_regs[i] = 1;
 #endif


Anatoly.



More information about the Gcc-patches mailing list