Module Name: src
Committed By: joerg
Date: Wed Dec 25 22:04:28 UTC 2013
Modified Files:
src/sys/arch/arm/arm: cpufunc_asm_armv5_ec.S
Log Message:
Use symbolic form for the third argument of mrc.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/arm/cpufunc_asm_armv5_ec.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/arm/arm/cpufunc_asm_armv5_ec.S
diff -u src/sys/arch/arm/arm/cpufunc_asm_armv5_ec.S:1.4 src/sys/arch/arm/arm/cpufunc_asm_armv5_ec.S:1.5
--- src/sys/arch/arm/arm/cpufunc_asm_armv5_ec.S:1.4 Sun Aug 18 06:28:18 2013
+++ src/sys/arch/arm/arm/cpufunc_asm_armv5_ec.S Wed Dec 25 22:04:28 2013
@@ -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 @@ ENTRY(armv5_ec_setttb)
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 @@ ENTRY_NP(armv5_ec_icache_sync_all)
.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_NP(armv5_ec_idcache_wbinv_all)
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
