Richard Earnshaw gcc/ * doc/tm.texi (OVERLAPPING_REGISTER_NAMES): Document new macro. * output.h (decode_reg_name_and_count): Declare. * varasm.c (decode_reg_name_and_count): New function. (decode_reg_name): Reimplement using decode_reg_name_and_count. * reginfo.c (fix_register): Use decode_reg_name_and_count and iterate over all regs used. * stmt.c (expand_asm_operands): Likewise. * config/arm/aout.h (OVERLAPPING_REGISTER_NAMES): Define. (ADDITIONAL_REGISTER_NAMES): Remove aliases that overlap multiple machine registers. 2010-07-26 Julian Brown Merge from Sourcery G++ 4.4: 2010-04-08 Bernd Schmidt Issue #6952 === modified file 'gcc/config/arm/aout.h' --- old/gcc/config/arm/aout.h 2009-06-21 19:48:15 +0000 +++ new/gcc/config/arm/aout.h 2010-08-13 11:53:46 +0000 @@ -163,31 +163,45 @@ {"mvdx12", 39}, \ {"mvdx13", 40}, \ {"mvdx14", 41}, \ - {"mvdx15", 42}, \ - {"d0", 63}, {"q0", 63}, \ - {"d1", 65}, \ - {"d2", 67}, {"q1", 67}, \ - {"d3", 69}, \ - {"d4", 71}, {"q2", 71}, \ - {"d5", 73}, \ - {"d6", 75}, {"q3", 75}, \ - {"d7", 77}, \ - {"d8", 79}, {"q4", 79}, \ - {"d9", 81}, \ - {"d10", 83}, {"q5", 83}, \ - {"d11", 85}, \ - {"d12", 87}, {"q6", 87}, \ - {"d13", 89}, \ - {"d14", 91}, {"q7", 91}, \ - {"d15", 93}, \ - {"q8", 95}, \ - {"q9", 99}, \ - {"q10", 103}, \ - {"q11", 107}, \ - {"q12", 111}, \ - {"q13", 115}, \ - {"q14", 119}, \ - {"q15", 123} \ + {"mvdx15", 42} \ +} +#endif + +#ifndef OVERLAPPING_REGISTER_NAMES +#define OVERLAPPING_REGISTER_NAMES \ +{ \ + {"d0", 63, 2}, \ + {"d1", 65, 2}, \ + {"d2", 67, 2}, \ + {"d3", 69, 2}, \ + {"d4", 71, 2}, \ + {"d5", 73, 2}, \ + {"d6", 75, 2}, \ + {"d7", 77, 2}, \ + {"d8", 79, 2}, \ + {"d9", 81, 2}, \ + {"d10", 83, 2}, \ + {"d11", 85, 2}, \ + {"d12", 87, 2}, \ + {"d13", 89, 2}, \ + {"d14", 91, 2}, \ + {"d15", 93, 2}, \ + {"q0", 63, 4}, \ + {"q1", 67, 4}, \ + {"q2", 71, 4}, \ + {"q3", 75, 4}, \ + {"q4", 79, 4}, \ + {"q5", 83, 4}, \ + {"q6", 87, 4}, \ + {"q7", 91, 4}, \ + {"q8", 95, 4}, \ + {"q9", 99, 4}, \ + {"q10", 103, 4}, \ + {"q11", 107, 4}, \ + {"q12", 111, 4}, \ + {"q13", 115, 4}, \ + {"q14", 119, 4}, \ + {"q15", 123, 4} \ } #endif === modified file 'gcc/doc/tm.texi' --- old/gcc/doc/tm.texi 2010-06-24 20:06:37 +0000 +++ new/gcc/doc/tm.texi 2010-08-13 11:53:46 +0000 @@ -8339,6 +8339,22 @@ to registers using alternate names. @end defmac +@defmac OVERLAPPING_REGISTER_NAMES +If defined, a C initializer for an array of structures containing a +name, a register number and a count of the number of consecutive +machine registers the name overlaps. This macro defines additional +names for hard registers, thus allowing the @code{asm} option in +declarations to refer to registers using alternate names. Unlike +@code{ADDITIONAL_REGISTER_NAMES}, this macro should be used when the +register name implies multiple underlying registers. + +This macro should be used when it is important that a clobber in an +@code{asm} statement clobbers all the underlying values implied by the +register name. For example, on ARM, clobbering the double-precision +VFP register ``d0'' implies clobbering both single-precision registers +``s0'' and ``s1''. +@end defmac + @defmac ASM_OUTPUT_OPCODE (@var{stream}, @var{ptr}) Define this macro if you are using an unusual assembler that requires different names for the machine instructions. === modified file 'gcc/output.h' --- old/gcc/output.h 2009-10-26 21:57:10 +0000 +++ new/gcc/output.h 2010-08-13 11:53:46 +0000 @@ -173,6 +173,11 @@ Prefixes such as % are optional. */ extern int decode_reg_name (const char *); +/* Similar to decode_reg_name, but takes an extra parameter that is a + pointer to the number of (internal) registers described by the + external name. */ +extern int decode_reg_name_and_count (const char *, int *); + extern void assemble_alias (tree, tree); extern void default_assemble_visibility (tree, int); === modified file 'gcc/reginfo.c' --- old/gcc/reginfo.c 2010-04-19 09:04:43 +0000 +++ new/gcc/reginfo.c 2010-08-13 11:53:46 +0000 @@ -799,36 +799,41 @@ fix_register (const char *name, int fixed, int call_used) { int i; + int reg, nregs; /* Decode the name and update the primary form of the register info. */ - if ((i = decode_reg_name (name)) >= 0) + if ((reg = decode_reg_name_and_count (name, &nregs)) >= 0) { - if ((i == STACK_POINTER_REGNUM + gcc_assert (nregs >= 1); + for (i = reg; i < reg + nregs; i++) + { + if ((i == STACK_POINTER_REGNUM #ifdef HARD_FRAME_POINTER_REGNUM - || i == HARD_FRAME_POINTER_REGNUM + || i == HARD_FRAME_POINTER_REGNUM #else - || i == FRAME_POINTER_REGNUM + || i == FRAME_POINTER_REGNUM #endif - ) - && (fixed == 0 || call_used == 0)) - { - static const char * const what_option[2][2] = { - { "call-saved", "call-used" }, - { "no-such-option", "fixed" }}; + ) + && (fixed == 0 || call_used == 0)) + { + static const char * const what_option[2][2] = { + { "call-saved", "call-used" }, + { "no-such-option", "fixed" }}; - error ("can't use '%s' as a %s register", name, - what_option[fixed][call_used]); - } - else - { - fixed_regs[i] = fixed; - call_used_regs[i] = call_used; + error ("can't use '%s' as a %s register", name, + what_option[fixed][call_used]); + } + else + { + fixed_regs[i] = fixed; + call_used_regs[i] = call_used; #ifdef CALL_REALLY_USED_REGISTERS - if (fixed == 0) - call_really_used_regs[i] = call_used; + if (fixed == 0) + call_really_used_regs[i] = call_used; #endif + } } } else === modified file 'gcc/stmt.c' --- old/gcc/stmt.c 2010-02-19 09:53:51 +0000 +++ new/gcc/stmt.c 2010-08-13 11:53:46 +0000 @@ -684,13 +684,14 @@ for (tail = clobbers; tail; tail = TREE_CHAIN (tail)) { const char *regname; + int nregs; if (TREE_VALUE (tail) == error_mark_node) return; regname = TREE_STRING_POINTER (TREE_VALUE (tail)); - i = decode_reg_name (regname); - if (i >= 0 || i == -4) + i = decode_reg_name_and_count (regname, &nregs); + if (i == -4) ++nclobbers; else if (i == -2) error ("unknown register name %qs in %", regname); @@ -698,14 +699,21 @@ /* Mark clobbered registers. */ if (i >= 0) { - /* Clobbering the PIC register is an error. */ - if (i == (int) PIC_OFFSET_TABLE_REGNUM) + int reg; + + for (reg = i; reg < i + nregs; reg++) { - error ("PIC register %qs clobbered in %", regname); - return; + ++nclobbers; + + /* Clobbering the PIC register is an error. */ + if (reg == (int) PIC_OFFSET_TABLE_REGNUM) + { + error ("PIC register clobbered by %qs in %", regname); + return; + } + + SET_HARD_REG_BIT (clobbered_regs, reg); } - - SET_HARD_REG_BIT (clobbered_regs, i); } } @@ -1026,7 +1034,8 @@ for (tail = clobbers; tail; tail = TREE_CHAIN (tail)) { const char *regname = TREE_STRING_POINTER (TREE_VALUE (tail)); - int j = decode_reg_name (regname); + int reg, nregs; + int j = decode_reg_name_and_count (regname, &nregs); rtx clobbered_reg; if (j < 0) @@ -1048,30 +1057,39 @@ continue; } - /* Use QImode since that's guaranteed to clobber just one reg. */ - clobbered_reg = gen_rtx_REG (QImode, j); - - /* Do sanity check for overlap between clobbers and respectively - input and outputs that hasn't been handled. Such overlap - should have been detected and reported above. */ - if (!clobber_conflict_found) + for (reg = j; reg < j + nregs; reg++) { - int opno; - - /* We test the old body (obody) contents to avoid tripping - over the under-construction body. */ - for (opno = 0; opno < noutputs; opno++) - if (reg_overlap_mentioned_p (clobbered_reg, output_rtx[opno])) - internal_error ("asm clobber conflict with output operand"); - - for (opno = 0; opno < ninputs - ninout; opno++) - if (reg_overlap_mentioned_p (clobbered_reg, - ASM_OPERANDS_INPUT (obody, opno))) - internal_error ("asm clobber conflict with input operand"); + /* Use QImode since that's guaranteed to clobber just + * one reg. */ + clobbered_reg = gen_rtx_REG (QImode, reg); + + /* Do sanity check for overlap between clobbers and + respectively input and outputs that hasn't been + handled. Such overlap should have been detected and + reported above. */ + if (!clobber_conflict_found) + { + int opno; + + /* We test the old body (obody) contents to avoid + tripping over the under-construction body. */ + for (opno = 0; opno < noutputs; opno++) + if (reg_overlap_mentioned_p (clobbered_reg, + output_rtx[opno])) + internal_error + ("asm clobber conflict with output operand"); + + for (opno = 0; opno < ninputs - ninout; opno++) + if (reg_overlap_mentioned_p (clobbered_reg, + ASM_OPERANDS_INPUT (obody, + opno))) + internal_error + ("asm clobber conflict with input operand"); + } + + XVECEXP (body, 0, i++) + = gen_rtx_CLOBBER (VOIDmode, clobbered_reg); } - - XVECEXP (body, 0, i++) - = gen_rtx_CLOBBER (VOIDmode, clobbered_reg); } if (nlabels > 0) === modified file 'gcc/varasm.c' --- old/gcc/varasm.c 2010-03-27 11:56:30 +0000 +++ new/gcc/varasm.c 2010-08-13 11:53:46 +0000 @@ -1043,8 +1043,11 @@ Prefixes such as % are optional. */ int -decode_reg_name (const char *asmspec) +decode_reg_name_and_count (const char *asmspec, int *pnregs) { + /* Presume just one register is clobbered. */ + *pnregs = 1; + if (asmspec != 0) { int i; @@ -1070,6 +1073,25 @@ && ! strcmp (asmspec, strip_reg_name (reg_names[i]))) return i; +#ifdef OVERLAPPING_REGISTER_NAMES + { + static const struct + { + const char *const name; + const int number; + const int nregs; + } table[] = OVERLAPPING_REGISTER_NAMES; + + for (i = 0; i < (int) ARRAY_SIZE (table); i++) + if (table[i].name[0] + && ! strcmp (asmspec, table[i].name)) + { + *pnregs = table[i].nregs; + return table[i].number; + } + } +#endif /* OVERLAPPING_REGISTER_NAMES */ + #ifdef ADDITIONAL_REGISTER_NAMES { static const struct { const char *const name; const int number; } table[] @@ -1093,6 +1115,14 @@ return -1; } + +int +decode_reg_name (const char *name) +{ + int count; + return decode_reg_name_and_count (name, &count); +} + /* Return true if DECL's initializer is suitable for a BSS section. */