From bdff3d2cfcab5364ef5824c83570097a7b21ac14 Mon Sep 17 00:00:00 2001
From: nemet <nemet@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 26 Nov 2008 22:14:50 +0000
Subject: [PATCH] 	* config/mips/mips.md (clear_hazard): Rename to 
 clear_hazard_<mode>.  Use mode-specific addition. 	(clear_cache): Rename
 gen_clear_hazard to gen_clear_hazard_si 	or gen_clear_hazard_di
 depending on the size of Pmode.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@142229 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog           |  7 +++++++
 gcc/config/mips/mips.md | 10 ++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 360d4317d25..c54964be926 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-26  Adam Nemet  <anemet@caviumnetworks.com>
+
+	* config/mips/mips.md (clear_hazard): Rename to
+	clear_hazard_<mode>.  Use mode-specific addition.
+	(clear_cache): Rename gen_clear_hazard to gen_clear_hazard_si
+	or gen_clear_hazard_di depending on the size of Pmode.
+
 2008-11-26  DJ Delorie  <dj@redhat.com>
 
 	* configure.ac: Test m32c-elf-gas for .loc.
diff --git a/gcc/config/mips/mips.md b/gcc/config/mips/mips.md
index 046f6a793a8..21b76c54475 100644
--- a/gcc/config/mips/mips.md
+++ b/gcc/config/mips/mips.md
@@ -4703,7 +4703,9 @@
     {
       mips_expand_synci_loop (operands[0], operands[1]);
       emit_insn (gen_sync ());
-      emit_insn (gen_clear_hazard ());
+      emit_insn (Pmode == SImode
+		 ? gen_clear_hazard_si ()
+		 : gen_clear_hazard_di ());
     }
   else if (mips_cache_flush_func && mips_cache_flush_func[0])
     {
@@ -4732,14 +4734,14 @@
   "ISA_HAS_SYNCI"
   "rdhwr\t%0,$1")
 
-(define_insn "clear_hazard"
+(define_insn "clear_hazard_<mode>"
   [(unspec_volatile [(const_int 0)] UNSPEC_CLEAR_HAZARD)
-   (clobber (reg:SI 31))]
+   (clobber (reg:P 31))]
   "ISA_HAS_SYNCI"
 {
   return "%(%<bal\t1f\n"
          "\tnop\n"
-         "1:\taddiu\t$31,$31,12\n"
+         "1:\t<d>addiu\t$31,$31,12\n"
          "\tjr.hb\t$31\n"
          "\tnop%>%)";
 }
-- 
2.11.0