Module Name: src
Committed By: matt
Date: Fri Jul 27 04:17:07 UTC 2012
Modified Files:
src/sys/arch/powerpc/powerpc: trap_subr.S
Log Message:
Use %r6 for setting PSL_RI, not %r30 since r30 needs to be preserved.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/powerpc/powerpc/trap_subr.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/powerpc/powerpc/trap_subr.S
diff -u src/sys/arch/powerpc/powerpc/trap_subr.S:1.74 src/sys/arch/powerpc/powerpc/trap_subr.S:1.75
--- src/sys/arch/powerpc/powerpc/trap_subr.S:1.74 Wed Jul 18 16:56:51 2012
+++ src/sys/arch/powerpc/powerpc/trap_subr.S Fri Jul 27 04:17:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: trap_subr.S,v 1.74 2012/07/18 16:56:51 matt Exp $ */
+/* $NetBSD: trap_subr.S,v 1.75 2012/07/27 04:17:07 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -1124,9 +1124,9 @@ _C_LABEL(sctrapexit):
streg %r4,FRAME_CTR(%r1); \
streg %r11,FRAME_SRR0(%r1); \
streg %r12,FRAME_SRR1(%r1); \
- mfmsr %r30; \
- ori %r30,%r30,PSL_RI; /* turn on recovery interrupt */\
- mtmsr %r30; \
+ mfmsr %r6; \
+ ori %r6,%r6,PSL_RI; /* turn on recovery interrupt */\
+ mtmsr %r6; \
SAVE_VRSAVE(%r1,%r6); \
SAVE_MQ(%r1,%r7)
