diff mbox series

[1/9] Move c6x REGNO_REG_CLASS out of line

Message ID mpta7bc3ymy.fsf@arm.com
State New
Headers show
Series Reduce the amount of global ABI state | expand

Commit Message

Richard Sandiford Sept. 10, 2019, 4:27 p.m. UTC 
I have a series of patches that hides call_used_regs from target-
independent code, a knock-on effect of which is that (public) target
macros can't use call_used_regs either.  This patch fixes the only
case in which that was a problem.


2019-09-10  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* config/c6x/c6x-protos.h (c6x_set_return_address): Declare.
	* config/c6x/c6x.h (REGNO_REG_CLASS): Move implementation to
	* config/c6x/c6x.c (c6x_regno_reg_class): ...this new function.

Comments

Jeff Law Sept. 10, 2019, 6:23 p.m. UTC | #1 
On 9/10/19 10:27 AM, Richard Sandiford wrote:
> I have a series of patches that hides call_used_regs from target-
> independent code, a knock-on effect of which is that (public) target
> macros can't use call_used_regs either.  This patch fixes the only
> case in which that was a problem.
> 
> 
> 2019-09-10  Richard Sandiford  <richard.sandiford@arm.com>
> 
> gcc/
> 	* config/c6x/c6x-protos.h (c6x_set_return_address): Declare.
> 	* config/c6x/c6x.h (REGNO_REG_CLASS): Move implementation to
> 	* config/c6x/c6x.c (c6x_regno_reg_class): ...this new function.
OK
jeff
diff mbox series

Patch

Index: gcc/config/c6x/c6x-protos.h
===================================================================
--- gcc/config/c6x/c6x-protos.h	2019-07-01 09:37:06.616529543 +0100
+++ gcc/config/c6x/c6x-protos.h	2019-09-10 17:22:34.514490030 +0100
@@ -53,6 +53,8 @@  extern void c6x_expand_epilogue (bool);
 extern rtx c6x_return_addr_rtx (int);
 
 extern void c6x_set_return_address (rtx, rtx);
+
+enum reg_class c6x_regno_reg_class (int);
 #endif
 
 extern void c6x_override_options (void);
Index: gcc/config/c6x/c6x.h
===================================================================
--- gcc/config/c6x/c6x.h	2019-03-08 18:15:37.924735697 +0000
+++ gcc/config/c6x/c6x.h	2019-09-10 17:22:34.518490002 +0100
@@ -259,12 +259,7 @@  #define A_REG_P(X) (REG_P (X) && A_REGNO
 #define CROSS_OPERANDS(X0,X1) \
   (A_REG_P (X0) == A_REG_P (X1) ? CROSS_N : CROSS_Y)
 
-#define REGNO_REG_CLASS(reg) \
-    ((reg) >= REG_A1 && (reg) <= REG_A2 ? PREDICATE_A_REGS	\
-     : (reg) == REG_A0 && TARGET_INSNS_64 ? PREDICATE_A_REGS	\
-     : (reg) >= REG_B0 && (reg) <= REG_B2 ? PREDICATE_B_REGS	\
-     : A_REGNO_P (reg) ? NONPREDICATE_A_REGS			\
-     : call_used_regs[reg] ? CALL_USED_B_REGS : B_REGS)
+#define REGNO_REG_CLASS(reg) c6x_regno_reg_class (reg)
 
 #define BASE_REG_CLASS ALL_REGS
 #define INDEX_REG_CLASS ALL_REGS
Index: gcc/config/c6x/c6x.c
===================================================================
--- gcc/config/c6x/c6x.c	2019-09-09 18:59:07.324158792 +0100
+++ gcc/config/c6x/c6x.c	2019-09-10 17:22:34.518490002 +0100
@@ -6677,6 +6677,28 @@  c6x_modes_tieable_p (machine_mode mode1,
 	      && GET_MODE_SIZE (mode2) <= UNITS_PER_WORD));
 }
 
+/* Implement REGNO_REG_CLASS.  */
+
+enum reg_class
+c6x_regno_reg_class (int reg)
+{
+  if (reg >= REG_A1 && reg <= REG_A2)
+    return PREDICATE_A_REGS;
+
+  if (reg == REG_A0 && TARGET_INSNS_64)
+    return PREDICATE_A_REGS;
+
+  if (reg >= REG_B0 && reg <= REG_B2)
+    return PREDICATE_B_REGS;
+
+  if (A_REGNO_P (reg))
+    return NONPREDICATE_A_REGS;
+
+  if (call_used_regs[reg])
+    return CALL_USED_B_REGS;
+
+  return B_REGS;
+}
 
 /* Target Structure.  */