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

arm.c (arm_cannot_copy_insn_p): Do not expect a PARALLEL.

Browse Source 
* config/arm/arm.c (arm_cannot_copy_insn_p): Do not expect a
	PARALLEL.
	* config/arm/arm.md (pic_add_dot_plus_four, pic_add_dot_plus_eight)
	(tls_load_dot_plus_eight): Move the label number into the unspec.
	* config/arm/thumb2.md (pic_load_dot_plus_four): Likewise.

	* gcc.dg/tls/opt-14.c: New.

From-SVN: r126178
This commit is contained in:
Daniel Jacobowitz 2007-07-01 21:15:14 +00:00 committed by Daniel Jacobowitz
parent af92ab368a
commit 10ae7c7b78
6 changed files with 54 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -1,3 +1,11 @@
2007-07-01 Daniel Jacobowitz <dan@codesourcery.com>
* config/arm/arm.c (arm_cannot_copy_insn_p): Do not expect a
PARALLEL.
* config/arm/arm.md (pic_add_dot_plus_four, pic_add_dot_plus_eight)
(tls_load_dot_plus_eight): Move the label number into the unspec.
* config/arm/thumb2.md (pic_load_dot_plus_four): Likewise.
2007-07-01 Andreas Schwab <schwab@suse.de>
* dwarf2out.c (initial_return_save): Define only if used.

5
gcc/config/arm/arm.c
View File

@ -6058,10 +6058,9 @@ arm_cannot_copy_insn_p (rtx insn)
{
rtx pat = PATTERN (insn);
if (GET_CODE (pat) == PARALLEL
&& GET_CODE (XVECEXP (pat, 0, 0)) == SET)
if (GET_CODE (pat) == SET)
{
rtx rhs = SET_SRC (XVECEXP (pat, 0, 0));
rtx rhs = SET_SRC (pat);
if (GET_CODE (rhs) == UNSPEC
&& XINT (rhs, 1) == UNSPEC_PIC_BASE)

18
gcc/config/arm/arm.md
View File

@ -4859,9 +4859,9 @@
(define_insn "pic_add_dot_plus_four"
[(set (match_operand:SI 0 "register_operand" "=r")
(unspec:SI [(plus:SI (match_operand:SI 1 "register_operand" "0")
(const (plus:SI (pc) (const_int 4))))]
UNSPEC_PIC_BASE))
(use (match_operand 2 "" ""))]
(const (plus:SI (pc) (const_int 4))))
(match_operand 2 "" "")]
UNSPEC_PIC_BASE))]
"TARGET_THUMB1"
"*
(*targetm.asm_out.internal_label) (asm_out_file, \"LPIC\",
@ -4874,9 +4874,9 @@
(define_insn "pic_add_dot_plus_eight"
[(set (match_operand:SI 0 "register_operand" "=r")
(unspec:SI [(plus:SI (match_operand:SI 1 "register_operand" "r")
(const (plus:SI (pc) (const_int 8))))]
UNSPEC_PIC_BASE))
(use (match_operand 2 "" ""))]
(const (plus:SI (pc) (const_int 8))))
(match_operand 2 "" "")]
UNSPEC_PIC_BASE))]
"TARGET_ARM"
"*
(*targetm.asm_out.internal_label) (asm_out_file, \"LPIC\",
@ -4889,9 +4889,9 @@
(define_insn "tls_load_dot_plus_eight"
[(set (match_operand:SI 0 "register_operand" "+r")
(mem:SI (unspec:SI [(plus:SI (match_operand:SI 1 "register_operand" "r")
(const (plus:SI (pc) (const_int 8))))]
UNSPEC_PIC_BASE)))
(use (match_operand 2 "" ""))]
(const (plus:SI (pc) (const_int 8))))
(match_operand 2 "" "")]
UNSPEC_PIC_BASE)))]
"TARGET_ARM"
"*
(*targetm.asm_out.internal_label) (asm_out_file, \"LPIC\",

6
gcc/config/arm/thumb2.md
View File

@ -259,9 +259,9 @@
;; word aligned.
(define_insn "pic_load_dot_plus_four"
[(set (match_operand:SI 0 "register_operand" "=r")
(unspec:SI [(const (plus:SI (pc) (const_int 4)))]
UNSPEC_PIC_BASE))
(use (match_operand 1 "" ""))]
(unspec:SI [(const (plus:SI (pc) (const_int 4)))
(use (match_operand 1 "" ""))]
UNSPEC_PIC_BASE))]
"TARGET_THUMB2"
"*
assemble_align(BITS_PER_WORD);

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2007-07-01 Daniel Jacobowitz <dan@codesourcery.com>
* gcc.dg/tls/opt-14.c: New.
2007-07-01 Ollie Wild <aaw@google.com>
* g++.dg/lookup/using16.C: New test.

28
gcc/testsuite/gcc.dg/tls/opt-14.c Normal file
View File

@ -0,0 +1,28 @@
/* This testcase generated invalid assembly on ARM Thumb-2. Two
PIC additions of pc were combined, but the deleted label was still
used. */
/* { dg-do assemble } */
/* { dg-options "-O2" } */
/* { dg-require-effective-target tls } */
struct __res_state
{
int options;
};
extern __thread struct __res_state *__resp
__attribute__ ((tls_model ("initial-exec")));
void foo (void);
int main(void)
{
int count, total = 0;
for (count = 0; count < 10; count++)
{
if (((*__resp).options & 0x00000001) == 0)
foo ();
(*__resp).options &= ~((0x00000002 | 0x00000200 | 0x00000080));
}
return 0;
}