Changeset dbf4417 in mainline

Timestamp:

2013-11-05T21:44:04Z (11 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

3d1956b

Parents:

9f9d725

Message:

Preemptible trap handler working.

File:

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

kernel/arch/sparc32/src/trap_table.S

@@ -118 +118 @@
 .macro inline_restore_kernel
         mov %wim, %l3
-        sll %l3, 7, %l4
-        srl %l3, 1, %l3
+        srl %l3, 7, %l4
+        sll %l3, 1, %l3
         or  %l3, %l4, %l3
         and %l3, 0xff, %l3
@@ -149 +149 @@
 .macro inline_restore_uspace uwb
         mov %wim, %l3
-        sll %l3, 7, %l4
-        srl %l3, 1, %l3
+        srl %l3, 7, %l4
+        sll %l3, 1, %l3
         or  %l3, %l4, %l3
         and %l3, 0xff, %l3
@@ -509 +509 @@
         nop
         nop
-        jmp %l1
+
+        /* If trap originated from uspace, clear uspace window mark and save uwb address for future use */
+        if_from_kernel 6f
+        switch_to_invalid %g5, %g6
+        clr %l7
+        mov %l6, %g7
+        switch_back %g5, %g6
+        mov %g7, %g1
+
+        /* If next window is invalid, do inline restore */
+6:      get_wim_number %g6
+        get_cwp %g7
+        inc %g7
+        cmp %g6, %g7
+        bne 8f
+
+        if_from_kernel 7f
+
+        inline_restore_uspace %g1
+        b 8f
+        nop
+
+7:      inline_restore_kernel
+
+8:      jmp %l1
         rett %l2
 
@@ -575 +599 @@
         nop
         nop
-        jmp %l2
+
+        /* If next window is invalid, do inline restore */
+6:      get_wim_number %g6
+        get_cwp %g7
+        inc %g7
+        cmp %g6, %g7
+        bne 8f
+
+        if_from_kernel 7f
+
+        inline_restore_uspace %g1
+        b 8f
+        nop
+
+7:      inline_restore_kernel
+
+
+8:      jmp %l2
         rett %l2 + 4