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

Revert 200443. 

From-SVN: r200444
This commit is contained in:
Michael Eager 2013-06-27 00:02:40 +00:00
parent 8eedc3ebe7
commit e2c600d251
5 changed files with 0 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/ChangeLog
View File

@ -1,12 +1,3 @@
2013-06-16 David Holsgrove <david.holsgrove@xilinx.com>
* gcc/config/microblaze/sync.md: New file.
* gcc/config/microblaze/microblaze.md: Add UNSPEC_SYNC_CAS,
UNSPEC_SYNC_XCHG and include sync.md.
* gcc/config/microblaze/microblaze.c: Add print_operand 'y'.
* gcc/config/microblaze/constraints.md: Add memory_contraint
'Q' which is a single register.
2013-06-26 Thomas Schwinge <thomas@codesourcery.com> 2013-06-26 Thomas Schwinge <thomas@codesourcery.com>
* config/i386/gnu.h [TARGET_LIBC_PROVIDES_SSP] * config/i386/gnu.h [TARGET_LIBC_PROVIDES_SSP]

5
gcc/config/microblaze/constraints.md
View File

@ -70,8 +70,3 @@
"Double word operand." "Double word operand."
(and (match_code "mem") (and (match_code "mem")
(match_test "double_memory_operand (op, GET_MODE (op))"))) (match_test "double_memory_operand (op, GET_MODE (op))")))
(define_memory_constraint "Q"
"Memory operand which is a single register."
(and (match_code "mem")
(match_test "GET_CODE ( XEXP (op, 0)) == REG")))

10
gcc/config/microblaze/microblaze.c
View File

@ -2118,7 +2118,6 @@ microblaze_initial_elimination_offset (int from, int to)
't' print 't' for EQ, 'f' for NE 't' print 't' for EQ, 'f' for NE
'm' Print 1<<operand. 'm' Print 1<<operand.
'i' Print 'i' if MEM operand has immediate value 'i' Print 'i' if MEM operand has immediate value
'y' Print 'y' if MEM operand is single register
'o' Print operand address+4 'o' Print operand address+4
'?' Print 'd' if we use a branch with delay slot instead of normal branch. '?' Print 'd' if we use a branch with delay slot instead of normal branch.
'h' Print high word of const_double (int or float) value as hex 'h' Print high word of const_double (int or float) value as hex
@ -2289,15 +2288,6 @@ print_operand (FILE * file, rtx op, int letter)
rtx op4 = adjust_address (op, GET_MODE (op), 4); rtx op4 = adjust_address (op, GET_MODE (op), 4);
output_address (XEXP (op4, 0)); output_address (XEXP (op4, 0));
} }
else if (letter == 'y')
{
rtx mem_reg = XEXP (op, 0);
if (GET_CODE (mem_reg) == REG)
{
register int regnum = REGNO (mem_reg);
fprintf (file, "%s", reg_names[regnum]);
}
}
else else
output_address (XEXP (op, 0)); output_address (XEXP (op, 0));

4
gcc/config/microblaze/microblaze.md
View File

@ -41,8 +41,6 @@
(UNSPEC_CMP 104) ;; signed compare (UNSPEC_CMP 104) ;; signed compare
(UNSPEC_CMPU 105) ;; unsigned compare (UNSPEC_CMPU 105) ;; unsigned compare
(UNSPEC_TLS 106) ;; jump table (UNSPEC_TLS 106) ;; jump table
(UNSPEC_SYNC_CAS 107) ;; Represent atomic compare swap.
(UNSPEC_SYNC_XCHG 108) ;; Represent atomic exchange.
]) ])
@ -2223,5 +2221,3 @@
[(set_attr "type" "arith") [(set_attr "type" "arith")
(set_attr "mode" "SI") (set_attr "mode" "SI")
(set_attr "length" "4")]) (set_attr "length" "4")])
(include "sync.md")

65
gcc/config/microblaze/sync.md
View File

@ -1,65 +0,0 @@
;; Machine description for Xilinx MicroBlaze synchronization instructions.
;; Copyright (C) 2011-2013
;; Free Software Foundation, Inc.
;;
;; This file is part of GCC.
;;
;; GCC is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 3, or (at your option)
;; any later version.
;;
;; GCC is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;;
;; You should have received a copy of the GNU General Public License
;; along with GCC; see the file COPYING3. If not see
;; <http://www.gnu.org/licenses/>.
(define_insn "sync_compare_and_swapsi"
[(set (match_operand:SI 0 "register_operand" "=&d") ;; retval
(match_operand:SI 1 "nonimmediate_operand" "+Q")) ;; mem
(set (match_dup 1)
(unspec
[(match_operand:SI 2 "register_operand" "d") ;; oldval
(match_operand:SI 3 "register_operand" "d")] ;; newval
UNSPEC_SYNC_CAS))
(clobber (match_scratch:SI 4 "=&d"))] ;; scratch
""
{
output_asm_insn ("addc \tr0,r0,r0", operands);
output_asm_insn ("lwx \t%0,%y1,r0", operands);
output_asm_insn ("addic\t%4,r0,0", operands);
output_asm_insn ("bnei \t%4,.-8", operands);
output_asm_insn ("cmp \t%4,%0,%2", operands);
output_asm_insn ("bnei \t%4,.+16", operands);
output_asm_insn ("swx \t%3,%y1,r0", operands);
output_asm_insn ("addic\t%4,r0,0", operands);
output_asm_insn ("bnei \t%4,.-28", operands);
return "";
}
)
(define_insn "sync_test_and_setsi"
[(set (match_operand:SI 0 "register_operand" "=&d") ;; retval
(match_operand:SI 1 "nonimmediate_operand" "+Q")) ;; mem
(set (match_dup 1)
(unspec
[(match_operand:SI 2 "register_operand" "d")] ;; value
UNSPEC_SYNC_XCHG))
(clobber (match_scratch:SI 3 "=&d"))] ;; scratch
""
{
output_asm_insn ("addc \tr0,r0,r0", operands);
output_asm_insn ("lwx \t%0,%y1,r0", operands);
output_asm_insn ("addic\t%3,r0,0", operands);
output_asm_insn ("bnei \t%3,.-8", operands);
output_asm_insn ("swx \t%2,%y1,r0", operands);
output_asm_insn ("addic\t%3,r0,0", operands);
output_asm_insn ("bnei \t%3,.-20", operands);
return "";
}
)