Module Name: src
Committed By: rin
Date: Sun Sep 11 08:57:39 UTC 2022
Modified Files:
src/sys/arch/powerpc/ibm4xx: trap.c
Log Message:
copy{in,out}(): Consistently use %[tmp] as scratch register. NFC.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/powerpc/ibm4xx/trap.c
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/powerpc/ibm4xx/trap.c
diff -u src/sys/arch/powerpc/ibm4xx/trap.c:1.90 src/sys/arch/powerpc/ibm4xx/trap.c:1.91
--- src/sys/arch/powerpc/ibm4xx/trap.c:1.90 Sun Sep 11 08:56:23 2022
+++ src/sys/arch/powerpc/ibm4xx/trap.c Sun Sep 11 08:57:39 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.90 2022/09/11 08:56:23 rin Exp $ */
+/* $NetBSD: trap.c,v 1.91 2022/09/11 08:57:39 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -69,7 +69,7 @@
#define __UFETCHSTORE_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.90 2022/09/11 08:56:23 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.91 2022/09/11 08:57:39 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -451,9 +451,9 @@ copyin(const void *uaddr, void *kaddr, s
__asm volatile(
"mfmsr %[msr];" /* Save MSR */
- "li %[pid],0x20;" /* Disable IMMU */
- "andc %[pid],%[msr],%[pid];"
- "mtmsr %[pid];"
+ "li %[tmp],0x20;" /* Disable IMMU */
+ "andc %[tmp],%[msr],%[tmp];"
+ "mtmsr %[tmp];"
"isync;"
"mfpid %[pid];" /* Save old PID */
@@ -570,9 +570,9 @@ copyout(const void *kaddr, void *uaddr,
__asm volatile(
"mfmsr %[msr];" /* Save MSR */
- "li %[pid],0x20;" /* Disable IMMU */
- "andc %[pid],%[msr],%[pid];"
- "mtmsr %[pid];"
+ "li %[tmp],0x20;" /* Disable IMMU */
+ "andc %[tmp],%[msr],%[tmp];"
+ "mtmsr %[tmp];"
"isync;"
"mfpid %[pid];" /* Save old PID */
