xnu-517.7.7.tar.gz

[apple/xnu.git] / osfmk / ppc / commpage / spinlocks.s

diff --git a/osfmk/ppc/commpage/spinlocks.s b/osfmk/ppc/commpage/spinlocks.s
index d619a6e8eba7b2fcf36c5ae4de1e435f3f31d356..249557777e2c682ecf4fee157ae5c7919b7786d7 100644 (file)
--- a/osfmk/ppc/commpage/spinlocks.s
+++ b/osfmk/ppc/commpage/spinlocks.s
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -59,11 +56,13 @@
 
 
 spinlock_32_try_mp:
+       mr      r5, r3
+       li      r3, 1
 1:
-        lwarx  r4,0,r3
+        lwarx  r4,0,r5
         cmpwi  r4,0
         bne-   2f
-        stwcx. r3,0,r3
+        stwcx. r5,0,r5
         isync                          // cancel speculative execution
         beqlr+
         b              1b
@@ -75,11 +74,13 @@ spinlock_32_try_mp:
         
 
 spinlock_32_try_up:
+       mr      r5, r3
+       li      r3, 1
 1:
-        lwarx  r4,0,r3
+        lwarx  r4,0,r5
         cmpwi  r4,0
         bne-   2f
-        stwcx. r3,0,r3
+        stwcx. r5,0,r5
         beqlr+
         b              1b
 2:
@@ -137,17 +138,19 @@ spinlock_32_unlock_up:
 
 
 spinlock_64_try_mp:
+       mr      r5, r3
+       li      r3, 1
 1:
-        lwarx  r4,0,r3
+        lwarx  r4,0,r5
         cmpwi  r4,0
         bne--  2f
-        stwcx. r3,0,r3
+        stwcx. r5,0,r5
         isync                          // cancel speculative execution
         beqlr++
         b              1b
 2:
         li             r6,-4
-        stwcx. r3,r6,r1        // clear the pending reservation (using red zone)
+        stwcx. r5,r6,r1        // clear the pending reservation (using red zone)
         li             r3,0            // Pass failure
         blr
 
@@ -155,16 +158,18 @@ spinlock_64_try_mp:
 
 
 spinlock_64_try_up:
+       mr      r5, r3
+       li      r3, 1
 1:
-        lwarx  r4,0,r3
+        lwarx  r4,0,r5
         cmpwi  r4,0
         bne--  2f
-        stwcx. r3,0,r3
+        stwcx. r5,0,r5
         beqlr++
         b              1b
 2:
         li             r6,-4
-        stwcx. r3,r6,r1        // clear the pending reservation (using red zone)
+        stwcx. r5,r6,r1        // clear the pending reservation (using red zone)
         li             r3,0
         blr