linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / arm / vfp / vfphw.S

diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S
index e51e667..de4ca12 100644 (file)
--- a/arch/arm/vfp/vfphw.S
+++ b/arch/arm/vfp/vfphw.S
@@ -102,6 +102,7 @@ vfp_support_entry:
        VFPFMRX r8, FPINST2, NE         @ FPINST2 if needed - avoids reading
                                        @ nonexistant reg on rev0
        VFPFSTMIA r4                    @ save the working registers
+       add     r4, r4, #8*16+4
        stmia   r4, {r1, r5, r6, r8}    @ save FPEXC, FPSCR, FPINST, FPINST2
                                        @ and point r4 at the word at the
                                        @ start of the register dump
@@ -110,9 +111,10 @@ no_old_VFP_process:
        DBGSTR1 "load state %p", r10
        str     r10, [r3]               @ update the last_VFP_context pointer
                                        @ Load the saved state back into the VFP
+       add     r4, r10, #8*16+4
+       ldmia   r4, {r1, r5, r6, r8}    @ load FPEXC, FPSCR, FPINST, FPINST2
        VFPFLDMIA r10                   @ reload the working registers while
                                        @ FPEXC is in a safe state
-       ldmia   r10, {r1, r5, r6, r8}   @ load FPEXC, FPSCR, FPINST, FPINST2
        tst     r1, #FPEXC_FPV2         @ is there an FPINST2 to write?
        VFPFMXR FPINST2, r8, NE         @ FPINST2 if needed - avoids writing
                                        @ nonexistant reg on rev0
@@ -178,21 +180,22 @@ vfp_get_float:
 
        .globl  vfp_put_float
 vfp_put_float:
-       add     pc, pc, r1, lsl #3
+       add     pc, pc, r0, lsl #3
        mov     r0, r0
        .irp    dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
-       mcr     p10, 0, r0, c\dr, c0, 0 @ fmsr  r0, s0
+       mcr     p10, 0, r1, c\dr, c0, 0 @ fmsr  r0, s0
        mov     pc, lr
-       mcr     p10, 0, r0, c\dr, c0, 4 @ fmsr  r0, s1
+       mcr     p10, 0, r1, c\dr, c0, 4 @ fmsr  r0, s1
        mov     pc, lr
        .endr
 
        .globl  vfp_get_double
 vfp_get_double:
+       mov     r0, r0, lsr #1
        add     pc, pc, r0, lsl #3
        mov     r0, r0
        .irp    dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
-       fmrrd   r0, r1, d\dr
+       mrrc    p10, 1, r0, r1, c\dr    @ fmrrd r0, r1, d\dr
        mov     pc, lr
        .endr
 
@@ -203,9 +206,10 @@ vfp_get_double:
 
        .globl  vfp_put_double
 vfp_put_double:
-       add     pc, pc, r2, lsl #3
+       mov     r0, r0, lsr #1
+       add     pc, pc, r0, lsl #3
        mov     r0, r0
        .irp    dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
-       fmdrr   d\dr, r0, r1
+       mcrr    p10, 1, r1, r2, c\dr    @ fmrrd r1, r2, d\dr
        mov     pc, lr
        .endr