Module Name: src Committed By: matt Date: Fri Feb 28 05:38:15 UTC 2014
Modified Files: src/sys/arch/powerpc/powerpc: lock_stubs.S Log Message: Make 64-bit clean To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 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.9 src/sys/arch/powerpc/powerpc/lock_stubs.S:1.10 --- src/sys/arch/powerpc/powerpc/lock_stubs.S:1.9 Sun Sep 23 06:05:32 2012 +++ src/sys/arch/powerpc/powerpc/lock_stubs.S Fri Feb 28 05:38:15 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: lock_stubs.S,v 1.9 2012/09/23 06:05:32 mrg Exp $ */ +/* $NetBSD: lock_stubs.S,v 1.10 2014/02/28 05:38:15 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -53,7 +53,7 @@ ENTRY(_lock_cas) 1: lptrarx %r10,0,%r3 - cmpw %r10,%r4 + cmpptr %r10,%r4 bne- 2f stptrcx. %r5,0,%r3 bne- 1b @@ -71,7 +71,7 @@ ENTRY(_lock_cas) ENTRY(mutex_enter) 1: lptrarx %r10,0,%r3 - cmpwi %r10,0 + cmpptri %r10,0 bne- 2f stptrcx. %r13,0,%r3 bne- 1b @@ -88,7 +88,7 @@ ENTRY(mutex_exit) li %r7,0 1: lptrarx %r10,0,%r3 - cmpw %r10,%r13 + cmpptr %r10,%r13 bne- 2f stptrcx. %r7,0,%r3 bne- 1b @@ -123,7 +123,7 @@ ENTRY(rw_enter) ori %r7,%r13,RW_WRITE_LOCKED 2: lptrarx %r10,0,%r3 - cmpw %r10,%r9 + cmpptr %r10,%r9 bne- 3f stptrcx. %r7,0,%r3 bne- 2b @@ -148,7 +148,7 @@ ENTRY(rw_tryenter) ori %r7,%r13,RW_WRITE_LOCKED 2: lptrarx %r10,0,%r3 - cmpw %r10,%r9 + cmpptr %r10,%r9 bne- 3f stptrcx. %r7,0,%r3 bne- 2b @@ -179,7 +179,7 @@ ENTRY(rw_exit) ori %r9,%r13,RW_WRITE_LOCKED 2: lptrarx %r10,0,%r3 - cmpw %r10,%r9 + cmpptr %r10,%r9 bne- 3f stptrcx. %r7,0,%r3 bne- 2b