[src/trunk]: src/sys/arch/arm/arm Use symbolic form for the third argument of...

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

details:   https://anonhg.NetBSD.org/src/rev/d91ea74cdee9
branches:  trunk
changeset: 325462:d91ea74cdee9
user:      joerg <joerg%NetBSD.org@localhost>
date:      Wed Dec 25 22:04:28 2013 +0000

description:
Use symbolic form for the third argument of mrc.

diffstat:

 sys/arch/arm/arm/cpufunc_asm_armv5_ec.S |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 5d27d45d985b -r d91ea74cdee9 sys/arch/arm/arm/cpufunc_asm_armv5_ec.S
--- a/sys/arch/arm/arm/cpufunc_asm_armv5_ec.S   Wed Dec 25 22:04:20 2013 +0000
+++ b/sys/arch/arm/arm/cpufunc_asm_armv5_ec.S   Wed Dec 25 22:04:28 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpufunc_asm_armv5_ec.S,v 1.4 2013/08/18 06:28:18 matt Exp $    */
+/*     $NetBSD: cpufunc_asm_armv5_ec.S,v 1.5 2013/12/25 22:04:28 joerg Exp $   */
 
 /*
  * Copyright (c) 2002, 2005 ARM Limited
@@ -63,7 +63,7 @@
        beq     2f                      @   nope, so don't
 
        mcr     p15, 0, r0, c7, c5, 0   /* Invalidate ICache */
-1:     mrc     p15, 0, r15, c7, c14, 3 /* Test, clean and invalidate DCache */
+1:     mrc     p15, 0, APSR_nzcv, c7, c14, 3   /* Test, clean and invalidate DCache */
        bne     1b                      /* More to do? */
        mcr     p15, 0, r0, c7, c10, 4  /* drain the write buffer */
        cmp     r0, #1
@@ -108,7 +108,7 @@
 
 .Larmv5_ec_dcache_wb:
 1:
-       mrc     p15, 0, r15, c7, c10, 3 /* Test and clean (don't invalidate) */
+       mrc     p15, 0, APSR_nzcv, c7, c10, 3   /* Test and clean (don't invalidate) */
        bne     1b                      /* More to do? */
        mcr     p15, 0, r0, c7, c10, 4  /* drain the write buffer */
        RET
@@ -205,7 +205,7 @@
 
 ENTRY(armv5_ec_dcache_wbinv_all)
 .Larmv5_ec_dcache_wbinv_all:
-1:     mrc     p15, 0, r15, c7, c14, 3 /* Test, clean and invalidate DCache */
+1:     mrc     p15, 0, APSR_nzcv, c7, c14, 3   /* Test, clean and invalidate DCache */
        bne     1b                      /* More to do? */
        mcr     p15, 0, r0, c7, c10, 4  /* drain the write buffer */
        RET