Author: jhibbits
Date: Wed Aug 19 06:07:32 2015
New Revision: 286916
URL: https://svnweb.freebsd.org/changeset/base/286916

Log:
  Save the registers at the correct offsets.
  
  When merging the AIM and BookE trap.c files, the offsets for BookE's setfault
  inadvertantly got munged.

Modified:
  head/sys/powerpc/booke/locore.S

Modified: head/sys/powerpc/booke/locore.S
==============================================================================
--- head/sys/powerpc/booke/locore.S     Wed Aug 19 02:37:30 2015        
(r286915)
+++ head/sys/powerpc/booke/locore.S     Wed Aug 19 06:07:32 2015        
(r286916)
@@ -723,11 +723,12 @@ setfault:
        mfsprg0 %r4
        lwz     %r4, TD_PCB(%r2)
        stw     %r3, PCB_ONFAULT(%r4)
-       mfcr    %r10
+       mfcr    %r4
        stw     %r0, 0(%r3)
        stw     %r1, 4(%r3)
        stw     %r2, 8(%r3)
-       stmw    %r13, 12(%r3)           /* store CR, CTR, XER, [r13 .. r31] */
+       stw     %r4, 8(%r3)
+       stmw    %r13, 16(%r3)           /* store CR, CTR, XER, [r13 .. r31] */
        li      %r3, 0                  /* return FALSE */
        blr
 
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to