Changeset 3f596c9 in mainline

Timestamp:

2013-11-03T20:31:54Z (11 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

9f9d725

Parents:

bbb94545

Message:

Bugfixing preemptive trap handlers.

File:

• kernel/arch/sparc32/src/trap_table.S (modified) (9 diffs)

kernel/arch/sparc32/src/trap_table.S

@@ -211 +211 @@
         /* dump registers to stack */
         save
+        st %l0, [%sp + 0] ! XXX
         std %l0, [%sp +  0]
         std %l2, [%sp +  8]
@@ -228 +229 @@
         inc %g7
 
-        /* dump registers to uwb */
 2:      save
         std %l0, [%g6 +  0]
@@ -240 +240 @@
         add %g4, 64, %g4
 
+        /* check whether it's the last user window to be saved */
+        mov %psr, %l4
+        and %l4, 0x7, %l4
+        inc %l4
+        cmp %g7, %l4
+        bne 3f
+        nop
+
+        /* clear uspace window mark */
+        clr %g7
+
 3:      /* back to where we should be */
         mov %g5, %l5
@@ -273 +284 @@
         nop
 
-        /* load registers from stack */
-        restore
-        restore
-        /* Save invalid window data */
+        restore
+        restore
         mov %l5, %g5            ! kernel stack pointer
         mov %l6, %g6            ! kernel wbuf
         mov %l7, %g7
-
-        /* we should check whether window needs to be saved
-         * to kernel stack or uwb
-         */
-        cmp %g7, 0
-        bne 3f
-        nop
 
         ldd [%sp +  0], %l0
@@ -299 +301 @@
         nop
 
-        /* load registers from uwb */
 1:      restore
         restore
-        /* Save invalid window data */
         mov %l5, %g5            ! kernel stack pointer
         mov %l6, %g6            ! kernel wbuf
         mov %l7, %g7
-3:      sub %g6, 64, %g6
+        sub %g6, 64, %g6
         ldd [%g6 +  0], %l0
         ldd [%g6 +  8], %l2
@@ -362 +362 @@
         switch_to_invalid %g5, %g6
         /* set uspace window mark */
-        mov %psr, %l7
+        mov %g6, %l7
         and %l7, 0x7, %l7
         inc %l7
@@ -369 +369 @@
         switch_back %g5, %g6
         mov %g7, %sp
-        mov %sp, %fp
-
-        /* Set secondary invalid window mark */
-        add %g7, 1, %l7
+//      mov %sp, %fp
 
 5:      /* Set up stack frame */
@@ -379 +376 @@
         /* Save trap data on stack */
         mov %psr, %l0
-        st %l1, [%fp - 4]
-        st %l2, [%fp - 8]
-        st %l0, [%fp - 12]
+        st %l1, [%sp + 92]
+        st %l2, [%sp + 96]
+        st %l0, [%sp + 100]
 
         /* Enable traps */
@@ -397 +394 @@
 
         /* Return from handler */
-        ld [%fp - 4], %l1
-        ld [%fp - 8], %l2
-        ld [%fp - 12], %l0
+        ld [%sp + 92], %l1
+        ld [%sp + 96], %l2
+        ld [%sp + 100], %l0
         mov %l0, %psr
         nop