Module Name: src
Committed By: martin
Date: Thu Jul 8 11:22:01 UTC 2021
Modified Files:
src/common/lib/libc/arch/aarch64/atomic [netbsd-9]: atomic_nand_16.S
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1319):
common/lib/libc/arch/aarch64/atomic/atomic_nand_16.S: revision 1.4
One more s/pte/ptr/
To generate a diff of this commit:
cvs rdiff -u -r1.1.28.1 -r1.1.28.2 \
src/common/lib/libc/arch/aarch64/atomic/atomic_nand_16.S
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/arch/aarch64/atomic/atomic_nand_16.S
diff -u src/common/lib/libc/arch/aarch64/atomic/atomic_nand_16.S:1.1.28.1 src/common/lib/libc/arch/aarch64/atomic/atomic_nand_16.S:1.1.28.2
--- src/common/lib/libc/arch/aarch64/atomic/atomic_nand_16.S:1.1.28.1 Tue Jul 6 04:13:50 2021
+++ src/common/lib/libc/arch/aarch64/atomic/atomic_nand_16.S Thu Jul 8 11:22:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_nand_16.S,v 1.1.28.1 2021/07/06 04:13:50 martin Exp $ */
+/* $NetBSD: atomic_nand_16.S,v 1.1.28.2 2021/07/08 11:22:01 martin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@ ENTRY_NP(_atomic_nand_16)
mov x4, x0
1: ldxrh w0, [x4] /* load old value (*ptr) */
and w3, w0, w1 /* w3 = (*ptr & value) */
- mvn w3, w3 /* w3 = ~(*pte & value) */
+ mvn w3, w3 /* w3 = ~(*ptr & value) */
stxrh w2, w3, [x4] /* try to store */
cbnz w2, 1b /* succeed? no, try again */
dmb st
@@ -58,7 +58,7 @@ ENTRY_NP(_atomic_nand_16_nv)
mov x4, x0 /* need r0 for return value */
1: ldxrh w0, [x4] /* load old value (*ptr) */
and w0, w0, w1 /* w0 = (*ptr & value) */
- mvn w0, w0 /* w0 = ~(*pte & value), return value */
+ mvn w0, w0 /* w0 = ~(*ptr & value), return value */
stxrh w2, w0, [x4] /* try to store */
cbnz w2, 1b /* succeed? no, try again? */
dmb st
