Module Name:    src
Committed By:   isaki
Date:           Fri Mar  1 09:57:32 UTC 2019

Modified Files:
        src/common/lib/libc/atomic: atomic_or_16_cas.c atomic_or_8_cas.c

Log Message:
Fix return value.  or_and_fetch should return new value.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/atomic/atomic_or_16_cas.c \
    src/common/lib/libc/atomic/atomic_or_8_cas.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/common/lib/libc/atomic/atomic_or_16_cas.c
diff -u src/common/lib/libc/atomic/atomic_or_16_cas.c:1.3 src/common/lib/libc/atomic/atomic_or_16_cas.c:1.4
--- src/common/lib/libc/atomic/atomic_or_16_cas.c:1.3	Mon Jun 23 21:53:45 2014
+++ src/common/lib/libc/atomic/atomic_or_16_cas.c	Fri Mar  1 09:57:32 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: atomic_or_16_cas.c,v 1.3 2014/06/23 21:53:45 joerg Exp $	*/
+/*	$NetBSD: atomic_or_16_cas.c,v 1.4 2019/03/01 09:57:32 isaki Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@ or_and_fetch_2(volatile uint16_t *addr, 
 		old = *addr;
 		new = old | val;
 	} while (atomic_cas_16(addr, old, new) != old);
-	return old;
+	return new;
 }
 
 __strong_alias(__atomic_fetch_or_2,__sync_fetch_and_or_2)
Index: src/common/lib/libc/atomic/atomic_or_8_cas.c
diff -u src/common/lib/libc/atomic/atomic_or_8_cas.c:1.3 src/common/lib/libc/atomic/atomic_or_8_cas.c:1.4
--- src/common/lib/libc/atomic/atomic_or_8_cas.c:1.3	Mon Jun 23 21:53:45 2014
+++ src/common/lib/libc/atomic/atomic_or_8_cas.c	Fri Mar  1 09:57:32 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: atomic_or_8_cas.c,v 1.3 2014/06/23 21:53:45 joerg Exp $	*/
+/*	$NetBSD: atomic_or_8_cas.c,v 1.4 2019/03/01 09:57:32 isaki Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@ or_and_fetch_1(volatile uint8_t *addr, u
 		old = *addr;
 		new = old | val;
 	} while (atomic_cas_8(addr, old, new) != old);
-	return old;
+	return new;
 }
 
 __strong_alias(__atomic_fetch_or_1,__sync_fetch_and_or_1)

Reply via email to