From 195610aaa05ba8ee8f3ec4bd5df3877610a5daf3 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Thu, 23 Feb 2017 23:04:00 +0000 Subject: [PATCH] visium.md (type): Add trap. * config/visium/visium.md (type): Add trap. (b): New mode attribute. (*btst): Rename into... (*btst): ...this and adjust. (*cbranchsi4_btst_insn): Rename into... (*cbranch4_btst_insn): ...this and adjust. (trap): New define_insn. From-SVN: r245691 --- gcc/ChangeLog | 10 ++++++ gcc/config/visium/visium.md | 32 +++++++++++++++----- gcc/testsuite/ChangeLog | 5 +++ gcc/testsuite/gcc.target/visium/bit_test.c | 2 +- gcc/testsuite/gcc.target/visium/block_move.c | 2 +- 5 files changed, 41 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ffb5e25510e..68cd88f1ff2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2017-02-23 Eric Botcazou + + * config/visium/visium.md (type): Add trap. + (b): New mode attribute. + (*btst): Rename into... + (*btst): ...this and adjust. + (*cbranchsi4_btst_insn): Rename into... + (*cbranch4_btst_insn): ...this and adjust. + (trap): New define_insn. + 2017-02-23 Jakub Jelinek PR tree-optimization/79389 diff --git a/gcc/config/visium/visium.md b/gcc/config/visium/visium.md index 87fa9b67fa0..501e874603c 100644 --- a/gcc/config/visium/visium.md +++ b/gcc/config/visium/visium.md @@ -137,9 +137,10 @@ ;nop No operation. ;multi Multiple instructions which split. ;asm User asm instructions. +;trap Trap instructions. (define_attr "type" -"imm_reg,mem_reg,eam_reg,fp_reg,reg_mem,reg_eam,reg_fp,arith,arith2,logic,abs_branch,branch,bmi,call,ret,rfi,dsi,cmp,div,divd,mul,shiftdi,fdiv,fsqrt,ftoi,itof,fmove,fcmp,fp,nop,multi,asm" (const_string "logic")) +"imm_reg,mem_reg,eam_reg,fp_reg,reg_mem,reg_eam,reg_fp,arith,arith2,logic,abs_branch,branch,bmi,call,ret,rfi,dsi,cmp,div,divd,mul,shiftdi,fdiv,fsqrt,ftoi,itof,fmove,fcmp,fp,nop,multi,asm,trap" (const_string "logic")) ; Those insns that occupy 4 bytes. (define_attr "single_insn" "no,yes" @@ -205,6 +206,7 @@ (define_mode_iterator QHI [QI HI]) (define_mode_iterator I [QI HI SI]) +(define_mode_attr b [(QI "8") (HI "16") (SI "32")]) (define_mode_attr s [(QI ".b") (HI ".w") (SI ".l")]) ; This code iterator allows signed and unsigned widening multiplications @@ -1986,15 +1988,15 @@ ; BITS_BIG_ENDIAN is defined to 1 so operand #1 counts from the MSB. -(define_insn "*btst" +(define_insn "*btst" [(set (reg:CCC R_FLAGS) - (compare:CCC (zero_extract:SI - (match_operand:SI 0 "register_operand" "r") + (compare:CCC (zero_extract:I + (match_operand:I 0 "register_operand" "r") (const_int 1) (match_operand:QI 1 "const_shift_operand" "K")) (const_int 0)))] "reload_completed" - "lsr.l r0,%0,32-%1" + "lsr r0,%0,-%1" [(set_attr "type" "logic")]) ;; @@ -2373,11 +2375,11 @@ } [(set_attr "type" "cmp")]) -(define_insn_and_split "*cbranchsi4_btst_insn" +(define_insn_and_split "*cbranch4_btst_insn" [(set (pc) (if_then_else (match_operator 0 "visium_equality_comparison_operator" - [(zero_extract:SI - (match_operand:SI 1 "register_operand" "r") + [(zero_extract:I + (match_operand:I 1 "register_operand" "r") (const_int 1) (match_operand:QI 2 "const_shift_operand" "K")) (const_int 0)]) @@ -2510,6 +2512,20 @@ "bra tr,%0,r0%# ;tablejump" [(set_attr "type" "abs_branch")]) +;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; +;; trap instructions +;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; + +(define_insn "trap" + [(trap_if (const_int 1) (const_int 0))] + "" + "stop 0,r0" + [(set_attr "type" "trap")]) + ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0bd9f065860..96a0234baaa 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-02-23 Eric Botcazou + + * gcc.target/visium/bit_test.c: Accept any lsr form. + * gcc.target/visium/block_move.c: Tweak. + 2017-02-23 Dominik Vogt PR 68749 diff --git a/gcc/testsuite/gcc.target/visium/bit_test.c b/gcc/testsuite/gcc.target/visium/bit_test.c index 2de9208f4b0..8fbb87ec971 100644 --- a/gcc/testsuite/gcc.target/visium/bit_test.c +++ b/gcc/testsuite/gcc.target/visium/bit_test.c @@ -27,5 +27,5 @@ void foo4 (unsigned char c) bar (); } -/* { dg-final { scan-assembler-times "lsr.l" 2 } } */ +/* { dg-final { scan-assembler-times "lsr" 2 } } */ /* { dg-final { scan-assembler-times "cmp" 2 } } */ diff --git a/gcc/testsuite/gcc.target/visium/block_move.c b/gcc/testsuite/gcc.target/visium/block_move.c index d85c135ebeb..f66c2614a09 100644 --- a/gcc/testsuite/gcc.target/visium/block_move.c +++ b/gcc/testsuite/gcc.target/visium/block_move.c @@ -11,7 +11,7 @@ void foo (void) int dst[LEN], src[LEN]; unsigned int i; - __builtin_memset (src, 0, LEN * sizeof (int)); + __builtin_memset (src, 1, LEN * sizeof (int)); __builtin_memcpy (dst, src, LEN * sizeof (int)); if (__builtin_memcmp (dst, src, LEN * sizeof (int)) != 0) abort (); -- 2.30.2