diff mbox

[7/9] Record the number of registers in a REG

Message ID 87siatsq0m.fsf@e105548-lin.cambridge.arm.com
State New
Headers show

Commit Message

Richard Sandiford May 18, 2015, 6:24 p.m. UTC 
This is the main patch, to record REG_NREGS in the REG itself.
The END_REGNO/END_HARD_REGNO distinction goes away in the next patch.


gcc/
	* rtl.h (reg_info): Add an nregs field.
	(REG_NREGS): Use it.
	(SET_REGNO_RAW): Delete.
	(set_regno_raw): New function.
	* regs.h (END_HARD_REGNO): Make equivalent to END_REGNO.
	(END_REGNO): Redefine in terms of REG_NREGS.
	* read-rtl.c (read_rtx_code): Call set_regno_raw instead of
	SET_REGNO_RAW.
	* emit-rtl.c (set_mode_and_regno): Likewise.
	* df-scan.c (df_ref_change_reg_with_loc): Use set_mode_and_regno
	instead of SET_REGNO_RAW.

Comments

Jeff Law May 18, 2015, 9:32 p.m. UTC | #1 
On 05/18/2015 12:24 PM, Richard Sandiford wrote:
> This is the main patch, to record REG_NREGS in the REG itself.
> The END_REGNO/END_HARD_REGNO distinction goes away in the next patch.
>
>
> gcc/
> 	* rtl.h (reg_info): Add an nregs field.
> 	(REG_NREGS): Use it.
> 	(SET_REGNO_RAW): Delete.
> 	(set_regno_raw): New function.
> 	* regs.h (END_HARD_REGNO): Make equivalent to END_REGNO.
> 	(END_REGNO): Redefine in terms of REG_NREGS.
> 	* read-rtl.c (read_rtx_code): Call set_regno_raw instead of
> 	SET_REGNO_RAW.
> 	* emit-rtl.c (set_mode_and_regno): Likewise.
> 	* df-scan.c (df_ref_change_reg_with_loc): Use set_mode_and_regno
> 	instead of SET_REGNO_RAW.
OK.
jeff
diff mbox

Patch

Index: gcc/rtl.h
===================================================================
--- gcc/rtl.h	2015-05-18 08:34:38.532523211 +0100
+++ gcc/rtl.h	2015-05-18 08:36:23.407245048 +0100
@@ -210,7 +210,9 @@  struct GTY(()) reg_info {
   /* The value of REGNO.  */
   unsigned int regno;
 
-  unsigned int unused : 32;
+  /* The value of REG_NREGS.  */
+  unsigned int nregs : 8;
+  unsigned int unused : 24;
 
   /* The value of REG_ATTRS.  */
   reg_attrs *attrs;
@@ -1712,15 +1714,11 @@  #define LABEL_REF_LABEL(LABREF) XCEXP (L
    be used on RHS.  Use SET_REGNO to change the value.  */
 #define REGNO(RTX) (rhs_regno(RTX))
 #define SET_REGNO(RTX, N) (df_ref_change_reg_with_loc (RTX, N))
-#define SET_REGNO_RAW(RTX, N) (REG_CHECK (RTX)->regno = N)
 
 /* Return the number of consecutive registers in a REG.  This is always
    1 for pseudo registers and is determined by HARD_REGNO_NREGS for
    hard registers.  */
-#define REG_NREGS(RTX) \
-  (REGNO (RTX) < FIRST_PSEUDO_REGISTER \
-   ? (unsigned int) hard_regno_nregs[REGNO (RTX)][GET_MODE (RTX)] \
-   : 1)
+#define REG_NREGS(RTX) (REG_CHECK (RTX)->nregs)
 
 /* ORIGINAL_REGNO holds the number the register originally had; for a
    pseudo register turned into a hard reg this will hold the old pseudo
@@ -1735,6 +1733,15 @@  rhs_regno (const_rtx x)
   return REG_CHECK (x)->regno;
 }
 
+/* Change the REGNO and REG_NREGS of REG X to the specified values,
+   bypassing the df machinery.  */
+static inline void
+set_regno_raw (rtx x, unsigned int regno, unsigned int nregs)
+{
+  reg_info *reg = REG_CHECK (x);
+  reg->regno = regno;
+  reg->nregs = nregs;
+}
 
 /* 1 if RTX is a reg or parallel that is the current function's return
    value.  */
Index: gcc/regs.h
===================================================================
--- gcc/regs.h	2015-05-18 08:34:38.532523211 +0100
+++ gcc/regs.h	2015-05-18 08:36:11.000000000 +0100
@@ -288,11 +288,11 @@  end_hard_regno (machine_mode mode, unsig
 
 /* Likewise for hard register X.  */
 
-#define END_HARD_REGNO(X) end_hard_regno (GET_MODE (X), REGNO (X))
+#define END_HARD_REGNO(X) END_REGNO (X)
 
 /* Likewise for hard or pseudo register X.  */
 
-#define END_REGNO(X) (HARD_REGISTER_P (X) ? END_HARD_REGNO (X) : REGNO (X) + 1)
+#define END_REGNO(X) (REGNO (X) + REG_NREGS (X))
 
 /* Add to REGS all the registers required to store a value of mode MODE
    in register REGNO.  */
Index: gcc/read-rtl.c
===================================================================
--- gcc/read-rtl.c	2015-05-18 08:34:38.532523211 +0100
+++ gcc/read-rtl.c	2015-05-18 08:34:38.532523211 +0100
@@ -1349,7 +1349,7 @@  read_rtx_code (const char *code_name)
       case 'r':
 	read_name (&name);
 	validate_const_int (name.string);
-	SET_REGNO_RAW (return_rtx, atoi (name.string));
+	set_regno_raw (return_rtx, atoi (name.string), 1);
 	REG_ATTRS (return_rtx) = NULL;
 	break;
 
Index: gcc/emit-rtl.c
===================================================================
--- gcc/emit-rtl.c	2015-05-18 08:34:38.532523211 +0100
+++ gcc/emit-rtl.c	2015-05-18 08:34:38.532523211 +0100
@@ -435,8 +435,11 @@  gen_blockage (void)
 void
 set_mode_and_regno (rtx x, machine_mode mode, unsigned int regno)
 {
+  unsigned int nregs = (HARD_REGISTER_NUM_P (regno)
+			? hard_regno_nregs[regno][mode]
+			: 1);
   PUT_MODE_RAW (x, mode);
-  SET_REGNO_RAW (x, regno);
+  set_regno_raw (x, regno, nregs);
 }
 
 /* Generate a new REG rtx.  Make sure ORIGINAL_REGNO is set properly, and
Index: gcc/df-scan.c
===================================================================
--- gcc/df-scan.c	2015-05-18 08:34:38.532523211 +0100
+++ gcc/df-scan.c	2015-05-18 08:36:11.000000000 +0100
@@ -1930,7 +1930,7 @@  df_ref_change_reg_with_loc (rtx loc, uns
 				    DF_REG_EQ_USE_GET (new_regno),
 				    new_regno, loc);
     }
-  SET_REGNO_RAW (loc, new_regno);
+  set_mode_and_regno (loc, GET_MODE (loc), new_regno);
 }