Changeset 4f843ded in mainline

Timestamp:

2012-11-25T18:46:58Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

48a209a

Parents:

37bb3e1

Message:

arm32, fpu: Improve context save/restore assembler.

File:

• kernel/arch/arm32/src/fpu_context.c (modified) (5 diffs)

kernel/arch/arm32/src/fpu_context.c

@@ -86 +86 @@
         asm volatile (
                 "vmrs r1, fpexc\n"
-                "stmia %0!, {r1}\n"
-                "vmrs r1, fpscr\n"
-                "stmia %0!, {r1}\n"
+                "vmrs r2, fpscr\n"
+                "stmia %0!, {r1, r2}\n"
                 "vstmia %0!, {s0-s31}\n"
-                ::"r" (ctx): "r1","memory"
+                ::"r" (ctx): "r1","r2","memory"
         );
 }
@@ -101 +100 @@
 {
         asm volatile (
-                "ldmia %0!, {r1}\n"
+                "ldmia %0!, {r1, r2}\n"
                 "vmsr fpexc, r1\n"
-                "ldmia %0!, {r1}\n"
-                "vmsr fpscr, r1\n"
+                "vmsr fpscr, r2\n"
                 "vldmia %0!, {s0-s31}\n"
-                ::"r" (ctx): "r1"
+                ::"r" (ctx): "r1","r2"
         );
 }
@@ -118 +116 @@
         asm volatile (
                 "vmrs r1, fpexc\n"
-                "stmia %0!, {r1}\n"
-                "vmrs r1, fpscr\n"
-                "stmia %0!, {r1}\n"
+                "vmrs r2, fpscr\n"
+                "stmia %0!, {r1, r2}\n"
                 "vstmia %0!, {d0-d15}\n"
-                ::"r" (ctx): "r1","memory"
+                ::"r" (ctx): "r1","r2","memory"
         );
 }
@@ -133 +130 @@
 {
         asm volatile (
-                "ldmia %0!, {r1}\n"
+                "ldmia %0!, {r1, r2}\n"
                 "vmsr fpexc, r1\n"
-                "ldmia %0!, {r1}\n"
-                "vmsr fpscr, r1\n"
+                "vmsr fpscr, r2\n"
                 "vldmia %0!, {d0-d15}\n"
-                ::"r" (ctx): "r1"
+                ::"r" (ctx): "r1","r2"
         );
 }
@@ -259 +255 @@
 void fpu_context_save(fpu_context_t *ctx)
 {
+        const uint32_t fpexc = fpexc_read();
+
+        if (fpexc & FPEXC_EX_FLAG) {
+                printf("EX FPU flag is on, things will fail\n");
+                //TODO implement common subarch context saving
+        }
         if (save_context)
                 save_context(ctx);