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

avr.c (out_shift_with_cnt): Use AS2 macro.

Browse Source 
* config/avr/avr.c (out_shift_with_cnt): Use AS2 macro.
	Correct insn length if shift count is a memory operand.
	* config/avr/avr.md: New define_peephole2 to use *reload_inqi.
	(*iorhi3_clobber): Change lo8 to hi8.
	(zero_extendhisi2): Change %B0 to %A1.
	(ashlhi3, ashrhi3): Correct insn length.
	(andhi3, abssf2, extendqisi2, extendhisi2): Change "cc"
	from "clobber" to "set_n" in some alternatives.

From-SVN: r36828
This commit is contained in:
Marek Michalkiewicz 2000-10-10 20:41:18 +02:00 committed by Denis Chertykov
parent 29f8b71838
commit 80b8585d94
3 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/ChangeLog
View File

@ -1,3 +1,14 @@
2000-10-09 Marek Michalkiewicz <marekm@linux.org.pl>
* config/avr/avr.c (out_shift_with_cnt): Use AS2 macro.
Correct insn length if shift count is a memory operand.
* config/avr/avr.md: New define_peephole2 to use *reload_inqi.
(*iorhi3_clobber): Change lo8 to hi8.
(zero_extendhisi2): Change %B0 to %A1.
(ashlhi3, ashrhi3): Correct insn length.
(andhi3, abssf2, extendqisi2, extendhisi2): Change "cc"
from "clobber" to "set_n" in some alternatives.
2000-10-10 Jakub Jelinek <jakub@redhat.com> 2000-10-10 Jakub Jelinek <jakub@redhat.com>
* reload1.c (calculate_needs_all_insns): If deleting an instruction, * reload1.c (calculate_needs_all_insns): If deleting an instruction,

6
gcc/config/avr/avr.c
View File

@ -2699,7 +2699,7 @@ out_shift_with_cnt (template, insn, operands, len)
if (len) if (len)
++*len; ++*len;
else else
strcat (str, "ldi %3,lo8((%2)-1)"); strcat (str, AS2 (ldi,%3,lo8((%2)-1)));
second_label = 0; second_label = 0;
} }
else if (GET_CODE (operands[2]) == MEM) else if (GET_CODE (operands[2]) == MEM)
@ -2718,7 +2718,7 @@ out_shift_with_cnt (template, insn, operands, len)
else else
{ {
out_movqi_r_mr (insn, op_mov, &mov_len); out_movqi_r_mr (insn, op_mov, &mov_len);
*len = mov_len + 1; *len += mov_len + 1;
} }
} }
else if (register_operand (operands[2], QImode)) else if (register_operand (operands[2], QImode))
@ -2731,7 +2731,7 @@ out_shift_with_cnt (template, insn, operands, len)
if (len) if (len)
++*len; ++*len;
else else
strcat (str, "mov %3,%2" CR_TAB); strcat (str, AS2 (mov,%3,%2) CR_TAB);
} }
if (len) if (len)

26
gcc/config/avr/avr.md
View File

@ -188,6 +188,16 @@
[(set_attr "length" "2") [(set_attr "length" "2")
(set_attr "cc" "none")]) (set_attr "cc" "none")])
(define_peephole2
[(match_scratch:QI 2 "d")
(set (match_operand:QI 0 "register_operand" "")
(match_operand:QI 1 "immediate_operand" ""))]
"(operands[1] != const0_rtx
&& test_hard_reg_class (NO_LD_REGS, operands[0]))"
[(parallel [(set (match_dup 0) (match_dup 1))
(clobber (match_dup 2))])]
"")
;;============================================================================ ;;============================================================================
;; move word (16 bit) ;; move word (16 bit)
@ -709,7 +719,7 @@
AS1 (clr,%B0)); AS1 (clr,%B0));
}" }"
[(set_attr "length" "2,2,3") [(set_attr "length" "2,2,3")
(set_attr "cc" "set_n,clobber,clobber")]) (set_attr "cc" "set_n,clobber,set_n")])
(define_insn "andsi3" (define_insn "andsi3"
[(set (match_operand:SI 0 "register_operand" "=r,d") [(set (match_operand:SI 0 "register_operand" "=r,d")
@ -793,7 +803,7 @@
"" ""
"@ "@
ldi %3,lo8(%2)\;or %A0,%3 ldi %3,lo8(%2)\;or %A0,%3
ldi %3,lo8(%2)\;or %A0,%3\;ldi %3,lo8(%2)\;or %B0,%3" ldi %3,lo8(%2)\;or %A0,%3\;ldi %3,hi8(%2)\;or %B0,%3"
[(set_attr "length" "2,4") [(set_attr "length" "2,4")
(set_attr "cc" "clobber,set_n")]) (set_attr "cc" "clobber,set_n")])
@ -894,7 +904,7 @@
(clobber (match_scratch:QI 3 "=X,X,X,X,&d,X"))] (clobber (match_scratch:QI 3 "=X,X,X,X,&d,X"))]
"" ""
"* return ashlhi3_out (insn, operands, NULL);" "* return ashlhi3_out (insn, operands, NULL);"
[(set_attr "length" "7,2,4,2,5,8") [(set_attr "length" "7,2,2,4,5,8")
(set_attr "cc" "clobber,set_n,clobber,set_n,clobber,clobber")]) (set_attr "cc" "clobber,set_n,clobber,set_n,clobber,clobber")])
(define_insn "ashlsi3" (define_insn "ashlsi3"
@ -926,7 +936,7 @@
(clobber (match_scratch:QI 3 "=X,X,X,X,&d,X"))] (clobber (match_scratch:QI 3 "=X,X,X,X,&d,X"))]
"" ""
"* return ashrhi3_out (insn, operands, NULL);" "* return ashrhi3_out (insn, operands, NULL);"
[(set_attr "length" "7,2,4,2,5,8") [(set_attr "length" "7,2,4,4,5,8")
(set_attr "cc" "clobber,clobber,clobber,clobber,clobber,clobber")]) (set_attr "cc" "clobber,clobber,clobber,clobber,clobber,clobber")])
(define_insn "ashrsi3" (define_insn "ashrsi3"
@ -992,7 +1002,7 @@
andi %D0,0x7f andi %D0,0x7f
clt\;bld %D0,7" clt\;bld %D0,7"
[(set_attr "length" "1,2") [(set_attr "length" "1,2")
(set_attr "cc" "clobber,clobber")]) (set_attr "cc" "set_n,clobber")])
;; 0 - x 0 - x 0 - x 0 - x 0 - x 0 - x 0 - x 0 - x 0 - x 0 - x 0 - x ;; 0 - x 0 - x 0 - x 0 - x 0 - x 0 - x 0 - x 0 - x 0 - x 0 - x 0 - x
;; neg ;; neg
@ -1094,7 +1104,7 @@
clr %B0\;sbrc %A0,7\;com %B0\;mov %C0,%B0\;mov %D0,%B0 clr %B0\;sbrc %A0,7\;com %B0\;mov %C0,%B0\;mov %D0,%B0
mov %A0,%A1\;clr %B0\;sbrc %A0,7\;com %B0\;mov %C0,%B0\;mov %D0,%B0" mov %A0,%A1\;clr %B0\;sbrc %A0,7\;com %B0\;mov %C0,%B0\;mov %D0,%B0"
[(set_attr "length" "5,6") [(set_attr "length" "5,6")
(set_attr "cc" "clobber,clobber")]) (set_attr "cc" "set_n,set_n")])
(define_insn "extendhisi2" (define_insn "extendhisi2"
[(set (match_operand:SI 0 "register_operand" "=r,&r") [(set (match_operand:SI 0 "register_operand" "=r,&r")
@ -1108,7 +1118,7 @@
(if_then_else (eq_attr "mcu_enhanced" "yes") (if_then_else (eq_attr "mcu_enhanced" "yes")
(const_int 5) (const_int 5)
(const_int 6))]) (const_int 6))])
(set_attr "cc" "clobber,clobber")]) (set_attr "cc" "set_n,set_n")])
;; xx<---x xx<---x xx<---x xx<---x xx<---x xx<---x xx<---x xx<---x xx<---x ;; xx<---x xx<---x xx<---x xx<---x xx<---x xx<---x xx<---x xx<---x xx<---x
;; zero extend ;; zero extend
@ -1139,7 +1149,7 @@
"" ""
"@ "@
clr %C0\;clr %D0 clr %C0\;clr %D0
{mov %A0,%A1\;mov %B0,%B1|movw %A0,%B0}\;clr %C0\;clr %D0" {mov %A0,%A1\;mov %B0,%B1|movw %A0,%A1}\;clr %C0\;clr %D0"
[(set_attr_alternative "length" [(set_attr_alternative "length"
[(const_int 2) [(const_int 2)
(if_then_else (eq_attr "mcu_enhanced" "yes") (if_then_else (eq_attr "mcu_enhanced" "yes")