OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Print location for conflicting global regs.

Browse Source 
gcc/

2011-06-08  Andi Kleen  <ak@linux.intel.com>

	* reginfo.c (global_regs_decl): Add.
	(globalize_reg): Add decl parameter. Compute location.
	Pass location to warnings and add inform. Store decl
	in global_regs_decl.
	* rtl.h (globalize_reg): Update prototype.
	* varasm.c (make_decl_rtl): Pass decl to globalize_reg().

From-SVN: r174834
This commit is contained in:
Andi Kleen 2011-06-09 06:20:05 +00:00 committed by Andi Kleen
parent df17530a85
commit 1460ec5c3d
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/ChangeLog
View File

@ -1,3 +1,12 @@
2011-06-08 Andi Kleen <ak@linux.intel.com>
* reginfo.c (global_regs_decl): Add.
(globalize_reg): Add decl parameter. Compute location.
Pass location to warnings and add inform. Store decl
in global_regs_decl.
* rtl.h (globalize_reg): Update prototype.
* varasm.c (make_decl_rtl): Pass decl to globalize_reg().
2011-06-09 Mingjie Xing <mingjie.xing@gmail.com> 2011-06-09 Mingjie Xing <mingjie.xing@gmail.com>
* treestruct.def (TS_TYPE_DECL): Fix the printable name typo. * treestruct.def (TS_TYPE_DECL): Fix the printable name typo.

18
gcc/reginfo.c
View File

@ -87,6 +87,9 @@ static const char initial_call_really_used_regs[] = CALL_REALLY_USED_REGISTERS;
and are also considered fixed. */ and are also considered fixed. */
char global_regs[FIRST_PSEUDO_REGISTER]; char global_regs[FIRST_PSEUDO_REGISTER];
/* Declaration for the global register. */
static tree GTY(()) global_regs_decl[FIRST_PSEUDO_REGISTER];
/* Same information as REGS_INVALIDATED_BY_CALL but in regset form to be used /* Same information as REGS_INVALIDATED_BY_CALL but in regset form to be used
in dataflow more conveniently. */ in dataflow more conveniently. */
regset regs_invalidated_by_call_regset; regset regs_invalidated_by_call_regset;
@ -825,8 +828,10 @@ fix_register (const char *name, int fixed, int call_used)
/* Mark register number I as global. */ /* Mark register number I as global. */
void void
globalize_reg (int i) globalize_reg (tree decl, int i)
{ {
location_t loc = DECL_SOURCE_LOCATION (decl);
#ifdef STACK_REGS #ifdef STACK_REGS
if (IN_RANGE (i, FIRST_STACK_REG, LAST_STACK_REG)) if (IN_RANGE (i, FIRST_STACK_REG, LAST_STACK_REG))
{ {
@ -836,18 +841,23 @@ globalize_reg (int i)
#endif #endif
if (fixed_regs[i] == 0 && no_global_reg_vars) if (fixed_regs[i] == 0 && no_global_reg_vars)
error ("global register variable follows a function definition"); error_at (loc, "global register variable follows a function definition");
if (global_regs[i]) if (global_regs[i])
{ {
warning (0, "register used for two global register variables"); warning_at (loc, 0,
"register of %qD used for multiple global register variables",
decl);
inform (DECL_SOURCE_LOCATION (global_regs_decl[i]),
"conflicts with %qD", global_regs_decl[i]);
return; return;
} }
if (call_used_regs[i] && ! fixed_regs[i]) if (call_used_regs[i] && ! fixed_regs[i])
warning (0, "call-clobbered register used for global register variable"); warning_at (loc, 0, "call-clobbered register used for global register variable");
global_regs[i] = 1; global_regs[i] = 1;
global_regs_decl[i] = decl;
/* If we're globalizing the frame pointer, we need to set the /* If we're globalizing the frame pointer, we need to set the
appropriate regs_invalidated_by_call bit, even if it's already appropriate regs_invalidated_by_call bit, even if it's already

2
gcc/rtl.h
View File

@ -2451,7 +2451,7 @@ extern void mark_elimination (int, int);
/* In reginfo.c */ /* In reginfo.c */
extern int reg_classes_intersect_p (reg_class_t, reg_class_t); extern int reg_classes_intersect_p (reg_class_t, reg_class_t);
extern int reg_class_subset_p (reg_class_t, reg_class_t); extern int reg_class_subset_p (reg_class_t, reg_class_t);
extern void globalize_reg (int); extern void globalize_reg (tree, int);
extern void init_reg_modes_target (void); extern void init_reg_modes_target (void);
extern void init_regs (void); extern void init_regs (void);
extern void reinit_regs (void); extern void reinit_regs (void);

2
gcc/varasm.c
View File

@ -1237,7 +1237,7 @@ make_decl_rtl (tree decl)
#endif #endif
nregs = hard_regno_nregs[reg_number][DECL_MODE (decl)]; nregs = hard_regno_nregs[reg_number][DECL_MODE (decl)];
while (nregs > 0) while (nregs > 0)
globalize_reg (reg_number + --nregs); globalize_reg (decl, reg_number + --nregs);
} }
/* As a register variable, it has no section. */ /* As a register variable, it has no section. */