Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/arm/arm32 Use armreg_auxctl_{read, write} instead of...
details: https://anonhg.NetBSD.org/src/rev/3d45325f7cc0
branches: trunk
changeset: 338801:3d45325f7cc0
user: skrll <skrll%NetBSD.org@localhost>
date: Tue Jun 09 10:44:55 2015 +0000
description:
Use armreg_auxctl_{read,write} instead of inline asm.
No functional change.
diffstat:
sys/arch/arm/arm32/pmap.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diffs (42 lines):
diff -r d231f990d542 -r 3d45325f7cc0 sys/arch/arm/arm32/pmap.c
--- a/sys/arch/arm/arm32/pmap.c Tue Jun 09 10:22:15 2015 +0000
+++ b/sys/arch/arm/arm32/pmap.c Tue Jun 09 10:44:55 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.324 2015/06/01 19:16:44 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.325 2015/06/09 10:44:55 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -216,7 +216,7 @@
#include <arm/locore.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.324 2015/06/01 19:16:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.325 2015/06/09 10:44:55 skrll Exp $");
//#define PMAP_DEBUG
#ifdef PMAP_DEBUG
@@ -7206,9 +7206,9 @@
/*
* Disable ECC protection of page table access, for now.
*/
- __asm volatile("mrc p15, 0, %0, c1, c0, 1" : "=r" (auxctl));
+ auxctl = armreg_auxctl_read();
auxctl &= ~XSCALE_AUXCTL_P;
- __asm volatile("mcr p15, 0, %0, c1, c0, 1" : : "r" (auxctl));
+ armreg_auxctl_write(auxctl);
}
/*
@@ -7261,9 +7261,9 @@
/* Invalidate data and mini-data. */
__asm volatile("mcr p15, 0, %0, c7, c6, 0" : : "r" (0));
- __asm volatile("mrc p15, 0, %0, c1, c0, 1" : "=r" (auxctl));
+ auxctl = armreg_auxctl_read();
auxctl = (auxctl & ~XSCALE_AUXCTL_MD_MASK) | XSCALE_AUXCTL_MD_WB_RWA;
- __asm volatile("mcr p15, 0, %0, c1, c0, 1" : : "r" (auxctl));
+ armreg_auxctl_write(auxctl);
}
/*
Home |
Main Index |
Thread Index |
Old Index