From 91cab67b08894efe37c89073c8f76e3e97799b0b Mon Sep 17 00:00:00 2001 From: he Date: Sun, 8 Mar 2009 12:08:19 +0000 Subject: [PATCH] Follow up the powerpc side by using %rN instead of rN for registers. --- .../lib/libc/arch/powerpc64/atomic/atomic_add.S | 16 ++++++++-------- .../lib/libc/arch/powerpc64/atomic/atomic_and.S | 16 ++++++++-------- .../lib/libc/arch/powerpc64/atomic/atomic_cas.S | 10 +++++----- .../lib/libc/arch/powerpc64/atomic/atomic_dec.S | 16 ++++++++-------- .../lib/libc/arch/powerpc64/atomic/atomic_inc.S | 16 ++++++++-------- .../lib/libc/arch/powerpc64/atomic/atomic_or.S | 16 ++++++++-------- .../lib/libc/arch/powerpc64/atomic/atomic_swap.S | 8 ++++---- 7 files changed, 49 insertions(+), 49 deletions(-) diff --git a/common/lib/libc/arch/powerpc64/atomic/atomic_add.S b/common/lib/libc/arch/powerpc64/atomic/atomic_add.S index b4ea71912a7b..c8345e2e962f 100644 --- a/common/lib/libc/arch/powerpc64/atomic/atomic_add.S +++ b/common/lib/libc/arch/powerpc64/atomic/atomic_add.S @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_add.S,v 1.4 2008/05/25 15:56:12 chs Exp $ */ +/* $NetBSD: atomic_add.S,v 1.5 2009/03/08 12:08:19 he Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -36,9 +36,9 @@ .text ENTRY(_atomic_add_64) -1: ldarx r10,0,r3 - add r10,r10,r4 - stdcx. r10,0(r3) +1: ldarx %r10,0,%r3 + add %r10,%r10,%r4 + stdcx. %r10,0,%r3 bne- 1b blr ATOMIC_OP_ALIAS(atomic_add_64,_atomic_add_64) @@ -48,11 +48,11 @@ ATOMIC_OP_ALIAS(atomic_add_ptr,_atomic_add_64) STRONG_ALIAS(_atomic_add_ptr,_atomic_add_64) ENTRY(_atomic_add_64_nv) -1: ldarx r10,0,r3 - add r10,r10,r4 - stdcx. r10,0,r3 +1: ldarx %r10,0,%r3 + add %r10,%r10,%r4 + stdcx. %r10,0,%r3 bne- 1b - mr r3,r10 + mr %r3,%r10 blr ATOMIC_OP_ALIAS(atomic_add_64_nv,_atomic_add_64_nv) ATOMIC_OP_ALIAS(atomic_add_long_nv,_atomic_add_64_nv) diff --git a/common/lib/libc/arch/powerpc64/atomic/atomic_and.S b/common/lib/libc/arch/powerpc64/atomic/atomic_and.S index cd1751808680..ad2158266857 100644 --- a/common/lib/libc/arch/powerpc64/atomic/atomic_and.S +++ b/common/lib/libc/arch/powerpc64/atomic/atomic_and.S @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_and.S,v 1.4 2008/05/25 15:56:12 chs Exp $ */ +/* $NetBSD: atomic_and.S,v 1.5 2009/03/08 12:08:19 he Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -36,9 +36,9 @@ .text ENTRY(_atomic_and_64) -1: ldarx r10,0,r3 - and r10,r10,r4 - stdcx. r10,0,r3 +1: ldarx %r10,0,%r3 + and %r10,%r10,%r4 + stdcx. %r10,0,%r3 bne- 1b blr ATOMIC_OP_ALIAS(atomic_and_64,_atomic_and_64) @@ -46,11 +46,11 @@ ATOMIC_OP_ALIAS(atomic_and_ulong,_atomic_and_64) STRONG_ALIAS(_atomic_and_ulong,_atomic_and_64) ENTRY(_atomic_and_64_nv) -1: ldarx r10,0,r3 - and r10,r10,r4 - stdcx. r10,0,r3 +1: ldarx %r10,0,%r3 + and %r10,%r10,%r4 + stdcx. %r10,0,%r3 bne- 1b - mr r3,r10 + mr %r3,%r10 blr ATOMIC_OP_ALIAS(atomic_and_64_nv,_atomic_and_64_nv) ATOMIC_OP_ALIAS(atomic_and_ulong_nv,_atomic_and_64_nv) diff --git a/common/lib/libc/arch/powerpc64/atomic/atomic_cas.S b/common/lib/libc/arch/powerpc64/atomic/atomic_cas.S index 5eb64502a4dc..fbebd03743bd 100644 --- a/common/lib/libc/arch/powerpc64/atomic/atomic_cas.S +++ b/common/lib/libc/arch/powerpc64/atomic/atomic_cas.S @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_cas.S,v 1.5 2008/05/25 15:56:12 chs Exp $ */ +/* $NetBSD: atomic_cas.S,v 1.6 2009/03/08 12:08:19 he Exp $ */ /*- * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. @@ -36,12 +36,12 @@ .text ENTRY(_atomic_cas_64) -1: ldarx r10,0,r3 - cmpd r10,r4 +1: ldarx %r10,0,%r3 + cmpd %r10,%r4 bne- 2f - stdcx. r5,0,r3 + stdcx. %r5,0,%r3 bne- 1b -2: mr r3,r10 +2: mr %r3,%r10 blr ATOMIC_OP_ALIAS(atomic_cas_64,_atomic_cas_64) diff --git a/common/lib/libc/arch/powerpc64/atomic/atomic_dec.S b/common/lib/libc/arch/powerpc64/atomic/atomic_dec.S index 33e7cce40f28..3c6d0466a2bd 100644 --- a/common/lib/libc/arch/powerpc64/atomic/atomic_dec.S +++ b/common/lib/libc/arch/powerpc64/atomic/atomic_dec.S @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_dec.S,v 1.4 2008/05/25 15:56:12 chs Exp $ */ +/* $NetBSD: atomic_dec.S,v 1.5 2009/03/08 12:08:19 he Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -36,9 +36,9 @@ .text ENTRY(_atomic_dec_64) -1: ldarx r10,0,r3 - addi r10,r10,-1 - stdcx. r10,0,r3 +1: ldarx %r10,0,%r3 + addi %r10,%r10,-1 + stdcx. %r10,0,%r3 bne- 1b blr ATOMIC_OP_ALIAS(atomic_dec_64,_atomic_dec_64) @@ -48,11 +48,11 @@ ATOMIC_OP_ALIAS(atomic_dec_ptr,_atomic_dec_64) STRONG_ALIAS(_atomic_dec_ptr,_atomic_dec_64) ENTRY(_atomic_dec_64_nv) -1: ldarx r10,0,r3 - addi r10,r10,-1 - stdcx. r10,0,r3 +1: ldarx %r10,0,%r3 + addi %r10,%r10,-1 + stdcx. %r10,0,%r3 bne- 1b - mr r3,r10 + mr %r3,%r10 blr ATOMIC_OP_ALIAS(atomic_dec_64_nv,_atomic_dec_64_nv) ATOMIC_OP_ALIAS(atomic_dec_ulong_nv,_atomic_dec_64_nv) diff --git a/common/lib/libc/arch/powerpc64/atomic/atomic_inc.S b/common/lib/libc/arch/powerpc64/atomic/atomic_inc.S index f54f31ad03e0..962c0f6bac09 100644 --- a/common/lib/libc/arch/powerpc64/atomic/atomic_inc.S +++ b/common/lib/libc/arch/powerpc64/atomic/atomic_inc.S @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_inc.S,v 1.4 2008/05/25 15:56:12 chs Exp $ */ +/* $NetBSD: atomic_inc.S,v 1.5 2009/03/08 12:08:19 he Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -36,9 +36,9 @@ .text ENTRY(_atomic_inc_64) -1: ldarx r10,0,r3 - addi r10,r10,1 - stdcx. r10,0,r3 +1: ldarx %r10,0,%r3 + addi %r10,%r10,1 + stdcx. %r10,0,%r3 bne- 1b blr ATOMIC_OP_ALIAS(atomic_inc_64,_atomic_inc_64) @@ -48,11 +48,11 @@ ATOMIC_OP_ALIAS(atomic_inc_ptr,_atomic_inc_64) STRONG_ALIAS(_atomic_inc_ptr,_atomic_inc_64) ENTRY(_atomic_inc_64_nv) -1: ldarx r10,0,r3 - addi r10,r10,1 - stdcx. r10,0,r3 +1: ldarx %r10,0,%r3 + addi %r10,%r10,1 + stdcx. %r10,0,%r3 bne- 1b - mr r3,r10 + mr %r3,%r10 blr ATOMIC_OP_ALIAS(atomic_inc_64_nv,_atomic_inc_64_nv) ATOMIC_OP_ALIAS(atomic_inc_ulong_nv,_atomic_inc_64_nv) diff --git a/common/lib/libc/arch/powerpc64/atomic/atomic_or.S b/common/lib/libc/arch/powerpc64/atomic/atomic_or.S index 146d7286749f..eee40279d427 100644 --- a/common/lib/libc/arch/powerpc64/atomic/atomic_or.S +++ b/common/lib/libc/arch/powerpc64/atomic/atomic_or.S @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_or.S,v 1.4 2008/05/25 15:56:12 chs Exp $ */ +/* $NetBSD: atomic_or.S,v 1.5 2009/03/08 12:08:19 he Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -36,9 +36,9 @@ .text ENTRY(_atomic_or_64) -1: ldarx r10,0,r3 - or r10,r10,r4 - stdcx. r10,0,r3 +1: ldarx %r10,0,%r3 + or %r10,%r10,%r4 + stdcx. %r10,0,%r3 bne- 1b blr ATOMIC_OP_ALIAS(atomic_or_64,_atomic_or_64) @@ -46,11 +46,11 @@ ATOMIC_OP_ALIAS(atomic_or_ulong,_atomic_or_64) STRONG_ALIAS(_atomic_or_ulong,_atomic_or_64) ENTRY(_atomic_or_64_nv) -1: ldarx r10,0,r3 - or r10,r10,r4 - stdcx. r10,0,r3 +1: ldarx %r10,0,%r3 + or %r10,%r10,%r4 + stdcx. %r10,0,%r3 bne- 1b - mr r3,r10 + mr %r3,%r10 blr ATOMIC_OP_ALIAS(atomic_or_64_nv,_atomic_or_64_nv) ATOMIC_OP_ALIAS(atomic_or_ulong_nv,_atomic_or_64_nv) diff --git a/common/lib/libc/arch/powerpc64/atomic/atomic_swap.S b/common/lib/libc/arch/powerpc64/atomic/atomic_swap.S index ad5615aea2ac..bba9800d94aa 100644 --- a/common/lib/libc/arch/powerpc64/atomic/atomic_swap.S +++ b/common/lib/libc/arch/powerpc64/atomic/atomic_swap.S @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_swap.S,v 1.4 2008/05/25 15:56:12 chs Exp $ */ +/* $NetBSD: atomic_swap.S,v 1.5 2009/03/08 12:08:19 he Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -36,10 +36,10 @@ .text ENTRY(_atomic_swap_64) -1: ldarx r10,0,r3 - stdcx. r4,0,r3 +1: ldarx %r10,0,%r3 + stdcx. %r4,0,%r3 bne- 1b - mr r3,r10 + mr %r3,%r10 blr ATOMIC_OP_ALIAS(atomic_swap_64,_atomic_swap_64) ATOMIC_OP_ALIAS(atomic_swap_ulong,_atomic_swap_64)