PR target/55673

	* config/sparc/sparc.c (sparc_emit_membar_for_model): Fix reversed
	handling of before and after cases.
	* config/sparc/sync.md (atomic_store): Fix pasto.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@194532 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 29ef252..c42fe1f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2012-12-16  Eric Botcazou  <ebotcazou@adacore.com>
+           Tomash Brechko  <tomash.brechko@gmail.com>
+
+       PR target/55673
+       * config/sparc/sparc.c (sparc_emit_membar_for_model): Fix reversed
+       handling of before and after cases.
+       * config/sparc/sync.md (atomic_store): Fix pasto.
+
 2012-12-14  Yvan Roux  <yvan.roux@linaro.org>
 
        * optabs.c (expand_atomic_store): Elide redundant model test.

diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 15f1adc..37fab67 100644 (file)
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -10949,26 +10949,26 @@ sparc_emit_membar_for_model (enum memmodel model,
 
   if (before_after & 1)
     {
-      if (model == MEMMODEL_ACQUIRE
-          || model == MEMMODEL_ACQ_REL
-          || model == MEMMODEL_SEQ_CST)
+      if (model == MEMMODEL_RELEASE
+         || model == MEMMODEL_ACQ_REL
+         || model == MEMMODEL_SEQ_CST)
        {
          if (load_store & 1)
-           mm |= LoadLoad | LoadStore;
+           mm |= LoadLoad | StoreLoad;
          if (load_store & 2)
-           mm |= StoreLoad | StoreStore;
+           mm |= LoadStore | StoreStore;
        }
     }
   if (before_after & 2)
     {
-      if (model == MEMMODEL_RELEASE
+      if (model == MEMMODEL_ACQUIRE
          || model == MEMMODEL_ACQ_REL
          || model == MEMMODEL_SEQ_CST)
        {
          if (load_store & 1)
-           mm |= LoadLoad | StoreLoad;
+           mm |= LoadLoad | LoadStore;
          if (load_store & 2)
-           mm |= LoadStore | StoreStore;
+           mm |= StoreLoad | StoreStore;
        }
     }
 

diff --git a/gcc/config/sparc/sync.md b/gcc/config/sparc/sync.md
index d07d572..7bb4f87 100644 (file)
--- a/gcc/config/sparc/sync.md
+++ b/gcc/config/sparc/sync.md
@@ -35,8 +35,7 @@
 
 (define_expand "membar"
   [(set (match_dup 1)
-       (unspec:BLK [(match_dup 1)
-                    (match_operand:SI 0 "const_int_operand")]
+       (unspec:BLK [(match_dup 1) (match_operand:SI 0 "const_int_operand")]
                    UNSPEC_MEMBAR))]
   "TARGET_V8 || TARGET_V9"
 {
@@ -66,7 +65,7 @@
   "stbar"
   [(set_attr "type" "multi")])
 
-;; For V8, LDSTUB has the effect of membar #StoreLoad
+;; For V8, LDSTUB has the effect of membar #StoreLoad.
 (define_insn "*membar_storeload"
   [(set (match_operand:BLK 0 "" "")
        (unspec:BLK [(match_dup 0) (const_int 2)] UNSPEC_MEMBAR))]
@@ -123,8 +122,8 @@
   [(set_attr "type" "load,fpload")])
 
 (define_expand "atomic_store<mode>"
-  [(match_operand:I 0 "register_operand" "")
-   (match_operand:I 1 "memory_operand" "")
+  [(match_operand:I 0 "memory_operand" "")
+   (match_operand:I 1 "register_operand" "")
    (match_operand:SI 2 "const_int_operand" "")]
   ""
 {