[src/trunk]: src/sys/arch/powerpc/powerpc Update for changes to <sys/rwlock.h...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a3a42248d14c
branches:  trunk
changeset: 1006613:a3a42248d14c
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Jan 21 04:30:14 2020 +0000

description:
Update for changes to <sys/rwlock.h> -- owner field is now bits 5-N.

diffstat:

 sys/arch/powerpc/powerpc/lock_stubs.S |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r cce6661c16eb -r a3a42248d14c sys/arch/powerpc/powerpc/lock_stubs.S
--- a/sys/arch/powerpc/powerpc/lock_stubs.S     Tue Jan 21 04:09:10 2020 +0000
+++ b/sys/arch/powerpc/powerpc/lock_stubs.S     Tue Jan 21 04:30:14 2020 +0000
@@ -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 @@
 /*
  * 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 @@
        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 @@
        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 @@
        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