From f2d443a680d049fa4f5d4a363d4b966ef19e7451 Mon Sep 17 00:00:00 2001 From: benno Date: Tue, 16 Apr 2002 12:07:41 +0000 Subject: Use mtsrin() instead of inline asm. --- sys/powerpc/aim/mmu_oea.c | 5 ++--- sys/powerpc/powerpc/mmu_oea.c | 5 ++--- sys/powerpc/powerpc/pmap.c | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) (limited to 'sys/powerpc') diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c index 2ba2b33..c144a73 100644 --- a/sys/powerpc/aim/mmu_oea.c +++ b/sys/powerpc/aim/mmu_oea.c @@ -724,8 +724,7 @@ pmap_bootstrap(vm_offset_t kernelstart, vm_offset_t kernelend) * Initialize hardware. */ for (i = 0; i < 16; i++) { - __asm __volatile("mtsrin %0,%1" - :: "r"(EMPTY_SEGMENT), "r"(i << ADDR_SR_SHFT)); + mtsrin(i << ADDR_SR_SHFT, EMPTY_SEGMENT); } __asm __volatile ("mtsr %0,%1" :: "n"(KERNEL_SR), "r"(KERNEL_SEGMENT)); @@ -1893,7 +1892,7 @@ pmap_pte_spill(vm_offset_t addr) pmap_pte_spills++; - __asm __volatile("mfsrin %0,%1" : "=r"(sr) : "r"(addr)); + sr = mfsrin(addr); ptegidx = va_to_pteg(sr, addr); /* diff --git a/sys/powerpc/powerpc/mmu_oea.c b/sys/powerpc/powerpc/mmu_oea.c index 2ba2b33..c144a73 100644 --- a/sys/powerpc/powerpc/mmu_oea.c +++ b/sys/powerpc/powerpc/mmu_oea.c @@ -724,8 +724,7 @@ pmap_bootstrap(vm_offset_t kernelstart, vm_offset_t kernelend) * Initialize hardware. */ for (i = 0; i < 16; i++) { - __asm __volatile("mtsrin %0,%1" - :: "r"(EMPTY_SEGMENT), "r"(i << ADDR_SR_SHFT)); + mtsrin(i << ADDR_SR_SHFT, EMPTY_SEGMENT); } __asm __volatile ("mtsr %0,%1" :: "n"(KERNEL_SR), "r"(KERNEL_SEGMENT)); @@ -1893,7 +1892,7 @@ pmap_pte_spill(vm_offset_t addr) pmap_pte_spills++; - __asm __volatile("mfsrin %0,%1" : "=r"(sr) : "r"(addr)); + sr = mfsrin(addr); ptegidx = va_to_pteg(sr, addr); /* diff --git a/sys/powerpc/powerpc/pmap.c b/sys/powerpc/powerpc/pmap.c index 2ba2b33..c144a73 100644 --- a/sys/powerpc/powerpc/pmap.c +++ b/sys/powerpc/powerpc/pmap.c @@ -724,8 +724,7 @@ pmap_bootstrap(vm_offset_t kernelstart, vm_offset_t kernelend) * Initialize hardware. */ for (i = 0; i < 16; i++) { - __asm __volatile("mtsrin %0,%1" - :: "r"(EMPTY_SEGMENT), "r"(i << ADDR_SR_SHFT)); + mtsrin(i << ADDR_SR_SHFT, EMPTY_SEGMENT); } __asm __volatile ("mtsr %0,%1" :: "n"(KERNEL_SR), "r"(KERNEL_SEGMENT)); @@ -1893,7 +1892,7 @@ pmap_pte_spill(vm_offset_t addr) pmap_pte_spills++; - __asm __volatile("mfsrin %0,%1" : "=r"(sr) : "r"(addr)); + sr = mfsrin(addr); ptegidx = va_to_pteg(sr, addr); /* -- cgit v1.1