git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AVR: target/122187 - Don't clobber recog_data.operand[] in insn out. 

avr.cc::avr_out_extr() and avr.cc::avr_out_extr_not()
changed xop for output, which spoiled the operand for
the next invokation, running into an assertion.

This patch makes a local copy of the operands.

	PR target/122187
gcc/
	* config/avr/avr.cc (avr_out_extr, avr_out_extr_not):
	Make a local copy of the passed rtx[] operands.

gcc/testsuite/
	* gcc.target/avr/torture/pr122187.c: New test.

(cherry picked from commit 3cbd43d640)
This commit is contained in:
Georg-Johann Lay 2025-10-07 17:50:34 +02:00
parent 774ee96d09
commit e4f5a5b494
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gcc/config/avr/avr.cc
View File

@ -10212,16 +10212,17 @@ avr_out_insv (rtx_insn *insn, rtx xop[], int *plen)
} }
/* Output instructions to extract a bit to 8-bit register XOP[0]. /* Output instructions to extract a bit to 8-bit register OP[0].
The input XOP[1] is a register or an 8-bit MEM in the lower I/O range. The input OP[1] is a register or an 8-bit MEM in the lower I/O range.
XOP[2] is the const_int bit position. Return "". OP[2] is the const_int bit position. Return "".
PLEN != 0: Set *PLEN to the code length in words. Don't output anything. PLEN != 0: Set *PLEN to the code length in words. Don't output anything.
PLEN == 0: Output instructions. */ PLEN == 0: Output instructions. */
const char * const char *
avr_out_extr (rtx_insn *insn, rtx xop[], int *plen) avr_out_extr (rtx_insn *insn, rtx op[], int *plen)
{ {
rtx xop[] = { op[0], op[1], op[2] };
rtx dest = xop[0]; rtx dest = xop[0];
rtx src = xop[1]; rtx src = xop[1];
int bit = INTVAL (xop[2]); int bit = INTVAL (xop[2]);
@ -10279,16 +10280,17 @@ avr_out_extr (rtx_insn *insn, rtx xop[], int *plen)
} }
/* Output instructions to extract a negated bit to 8-bit register XOP[0]. /* Output instructions to extract a negated bit to 8-bit register OP[0].
The input XOP[1] is an 8-bit register or MEM in the lower I/O range. The input OP[1] is an 8-bit register or MEM in the lower I/O range.
XOP[2] is the const_int bit position. Return "". OP[2] is the const_int bit position. Return "".
PLEN != 0: Set *PLEN to the code length in words. Don't output anything. PLEN != 0: Set *PLEN to the code length in words. Don't output anything.
PLEN == 0: Output instructions. */ PLEN == 0: Output instructions. */
const char * const char *
avr_out_extr_not (rtx_insn * /* insn */, rtx xop[], int *plen) avr_out_extr_not (rtx_insn * /* insn */, rtx op[], int *plen)
{ {
rtx xop[] = { op[0], op[1], op[2] };
rtx dest = xop[0]; rtx dest = xop[0];
rtx src = xop[1]; rtx src = xop[1];
int bit = INTVAL (xop[2]); int bit = INTVAL (xop[2]);

17
gcc/testsuite/gcc.target/avr/torture/pr122187.c Normal file
View File

@ -0,0 +1,17 @@
/* { dg-do compile } */
/* { dg-additional-options { -std=c99 } } */
typedef __UINT32_TYPE__ uint32_t;
typedef __UINT16_TYPE__ uint16_t;
typedef __UINT8_TYPE__ uint8_t;
#define PINB (*(volatile uint8_t*) (13 + __AVR_SFR_OFFSET__))
#define PB1 1
uint16_t fun (void)
{
uint16_t h = 0;
for (uint32_t s = 0; s < 0x10000; ++s)
h += (PINB >> PB1) & 1;
return h;
}