Module Name: src
Committed By: thorpej
Date: Tue Jan 21 04:30:14 UTC 2020
Modified Files:
src/sys/arch/powerpc/powerpc: lock_stubs.S
Log Message:
Update for changes to <sys/rwlock.h> -- owner field is now bits 5-N.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/powerpc/lock_stubs.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/powerpc/lock_stubs.S
diff -u src/sys/arch/powerpc/powerpc/lock_stubs.S:1.10 src/sys/arch/powerpc/powerpc/lock_stubs.S:1.11
--- src/sys/arch/powerpc/powerpc/lock_stubs.S:1.10 Fri Feb 28 05:38:15 2014
+++ src/sys/arch/powerpc/powerpc/lock_stubs.S Tue Jan 21 04:30:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs.S,v 1.10 2014/02/28 05:38:15 matt Exp $ */
+/* $NetBSD: lock_stubs.S,v 1.11 2020/01/21 04:30:14 thorpej Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -101,8 +101,8 @@ ENTRY(mutex_exit)
/*
* void rw_enter(krwlock_t *krw, krw_t op);
*/
-#if RW_READ_INCR != 16
-#error RW_READ_INCR != 16, clrrXi need fixing
+#if RW_READ_INCR != 32
+#error RW_READ_INCR != 32, clrrXi need fixing
#endif
#if RW_OWNER != 0
#error RW_OWNER != 0, ldptr should be ldptru
@@ -115,7 +115,7 @@ ENTRY(rw_enter)
bne- 1f
ldptr %r9,RW_OWNER(%r3)
- clrrptri %r9,%r9,4 /* clear low 4 bits */
+ clrrptri %r9,%r9,5 /* clear low 5 bits */
addi %r7,%r9,RW_READ_INCR
b 2f
1:
@@ -140,7 +140,7 @@ ENTRY(rw_tryenter)
bne- 1f
ldptr %r9,RW_OWNER(%r3)
- clrrptri %r9,%r9,4 /* clear low 4 bits */
+ clrrptri %r9,%r9,5 /* clear low 5 bits */
addi %r7,%r9,RW_READ_INCR
b 2f
@@ -169,7 +169,7 @@ ENTRY(rw_exit)
andi. %r0,%r9,RW_WRITE_LOCKED
bne- 1f
- clrrptri. %r9,%r9,4 /* clear low 4 bits */
+ clrrptri. %r9,%r9,5 /* clear low 5 bits */
beq- 3f /* if 0, no reader, go slow */
addi %r7,%r9,-RW_READ_INCR
