[src/netbsd-6]: src/sys/arch/powerpc/booke Pull up following revision(s) (req...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/66697a7b8bcb
branches:  netbsd-6
changeset: 774222:66697a7b8bcb
user:      riz <riz%NetBSD.org@localhost>
date:      Wed Jun 13 19:42:56 2012 +0000

description:
Pull up following revision(s) (requested by matt in ticket #339):
        sys/arch/powerpc/booke/spe_subr.S: revision 1.3
Fix SPE loading typo as described in PR/45731

diffstat:

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

diffs (27 lines):

diff -r 1603e7256371 -r 66697a7b8bcb sys/arch/powerpc/booke/spe_subr.S
--- a/sys/arch/powerpc/booke/spe_subr.S Wed Jun 13 19:41:28 2012 +0000
+++ b/sys/arch/powerpc/booke/spe_subr.S Wed Jun 13 19:42:56 2012 +0000
@@ -30,7 +30,7 @@
 #include <machine/asm.h>
 #include "assym.h"
 
-RCSID("$NetBSD: spe_subr.S,v 1.2 2011/01/18 01:02:52 matt Exp $")
+RCSID("$NetBSD: spe_subr.S,v 1.2.16.1 2012/06/13 19:42:56 riz Exp $")
 
        .text
        .machine        e500x2
@@ -90,11 +90,11 @@
        evldw %r10,(10 << 2)(%r3)
                evmergelo %r11,%r10,%r11
        evldw %r8,(8 << 2)(%r3)
-               evmergelo %r19,%r8,%r19
+               evmergelo %r9,%r8,%r9
        evldw %r6,(6 << 2)(%r3)
-               evmergelo %r17,%r6,%r17
+               evmergelo %r7,%r6,%r7
        evldw %r4,(4 << 2)(%r3)
-               evmergelo %r15,%r4,%r15
+               evmergelo %r5,%r4,%r5
 
        /*
         * R2 isn't a callee-saved, so load into r0 because we still need r3