Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/powerpc/powerpc Use %r6 for setting PSL_RI, not %r3...



details:   https://anonhg.NetBSD.org/src/rev/587399f2374c
branches:  trunk
changeset: 780484:587399f2374c
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Jul 27 04:17:07 2012 +0000

description:
Use %r6 for setting PSL_RI, not %r30 since r30 needs to be preserved.

diffstat:

 sys/arch/powerpc/powerpc/trap_subr.S |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (22 lines):

diff -r df2e0ed3cb0c -r 587399f2374c sys/arch/powerpc/powerpc/trap_subr.S
--- a/sys/arch/powerpc/powerpc/trap_subr.S      Fri Jul 27 03:10:23 2012 +0000
+++ b/sys/arch/powerpc/powerpc/trap_subr.S      Fri Jul 27 04:17:07 2012 +0000
@@ -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 @@
        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)
 



Home | Main Index | Thread Index | Old Index