* config/nvptx/nvptx.md (const_0_operand, global_mem_operand,

	const_mem_operand, param_mem_operand, shared_mem_operand): Delete.
	(ctrap<mode>): Use const0_operand.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231047 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7b745ca..e49fd7a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-11-29  Nathan Sidwell  <nathan@acm.org>
+
+       * config/nvptx/nvptx.md (const_0_operand, global_mem_operand,
+       const_mem_operand, param_mem_operand, shared_mem_operand): Delete.
+       (ctrap<mode>): Use const0_operand.
+
 2015-11-29  Jan Hubicka  <hubicka@ucw.cz>
 
        * ipa-devirt.c (add_type_duplicate): Remove redundant ODR violation
@@ -65,10 +71,10 @@
 2015-11-27  Nathan Sidwell  <nathan@acm.org>
 
        * config/nvptx/nvptx-protos.h (nvptx_record_needed_decl): Don't
-       declaree.
+       declare.
        * config/nvptx/nvptx.c (write_func_decl_from_insn): Move earlier.
        (nvptx_record_fndecl): Don't return value, remove force
-       argyment. Require fndecl.
+       argument. Require fndecl.
        (nvptx_record_libfunc): New.
        (nvptx_record_needed_decl): Deteermine how to record decl here.
        (nvptx_maybe_record_fnsym): New.

diff --git a/gcc/config/nvptx/nvptx.md b/gcc/config/nvptx/nvptx.md
index 8d7535a..fd01563 100644 (file)
--- a/gcc/config/nvptx/nvptx.md
+++ b/gcc/config/nvptx/nvptx.md
@@ -153,26 +153,6 @@
   return nonimmediate_operand (op, mode);
 })
 
-(define_predicate "const_0_operand"
-  (and (match_code "const_int,const_double,const_vector")
-       (match_test "op == CONST0_RTX (GET_MODE (op))")))
-
-(define_predicate "global_mem_operand"
-  (and (match_code "mem")
-       (match_test "MEM_ADDR_SPACE (op) == ADDR_SPACE_GLOBAL")))
-
-(define_predicate "const_mem_operand"
-  (and (match_code "mem")
-       (match_test "MEM_ADDR_SPACE (op) == ADDR_SPACE_CONST")))
-
-(define_predicate "param_mem_operand"
-  (and (match_code "mem")
-       (match_test "MEM_ADDR_SPACE (op) == ADDR_SPACE_PARAM")))
-
-(define_predicate "shared_mem_operand"
-  (and (match_code "mem")
-       (match_test "MEM_ADDR_SPACE (op) == ADDR_SPACE_SHARED")))
-
 (define_predicate "const0_operand"
   (and (match_code "const_int")
        (match_test "op == const0_rtx")))
@@ -1330,7 +1310,7 @@
   [(trap_if (match_operator 0 "nvptx_comparison_operator"
                            [(match_operand:SDIM 1 "nvptx_register_operand")
                             (match_operand:SDIM 2 "nvptx_nonmemory_operand")])
-           (match_operand 3 "const_0_operand"))]
+           (match_operand 3 "const0_operand"))]
   ""
 {
   rtx t = nvptx_expand_compare (operands[0]);