Changeset 208b5f5 in mainline for kernel/arch/sparc32/src/trap_table.S

Timestamp:

2013-12-29T14:32:55Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

4c14b88, 6fa9a99d, 9be30cdf, aacdb8e

Parents:

2a13328

Message:

cherrypick important fixes and updates from lp:~jceel/helenos/leon3

File:

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

kernel/arch/sparc32/src/trap_table.S

@@ -165 +165 @@
         save
         
-        ldd [%sp +  0], %l0
-        ldd [%sp +  8], %l2
+        ldd [%sp + 0], %l0
+        ldd [%sp + 8], %l2
         ldd [%sp + 16], %l4
         ldd [%sp + 24], %l6
@@ -430 +430 @@
         nop
         
-        
         1:
                 /* Rotate WIM on bit LEFT, we have 8 windows */
@@ -442 +441 @@
                 mov %g0, %wim
                 nop; nop; nop
-                
+        
         /* Kernel: */
         restore
@@ -563 +562 @@
                 mov %psr, %l0
                 or %l0, (1 << 5), %l0
+                or %l0, 0xf00, %l0
                 mov %l0, %psr
                 nop
@@ -568 +568 @@
                 nop
                 nop
-                
-                /* Get UWB address */
-                ##      switch_to_invalid %g5, %g6
-                ##      mov %l6, %g1
-                ##      switch_back %g5, %g6
                 
                 /* Flush windows to stack */
@@ -582 +577 @@
                 add %sp, 128, %o1
                 
-                /* Return from handler */
+                /* Return from handler (leave PIL disabled) */
                 ld [%sp + 92], %l1
                 ld [%sp + 96], %l2
                 ld [%sp + 100], %l0
+                or %l0, 0xf00, %l0
                 mov %l0, %psr
                 nop
@@ -653 +649 @@
                 ld [%sp + 116], %g4
                 ld [%sp + 120], %g7
+                
                 mov %l3, %sp
                 b 10f
@@ -659 +656 @@
         9:
                 inline_restore_kernel
+                
                 ld [%sp + 104], %g1
                 ld [%sp + 108], %g2
@@ -664 +662 @@
                 ld [%sp + 116], %g4
                 ld [%sp + 120], %g7
+        
+                /* Restore old sp */
+                add %sp, 128, %sp
         
         10:
@@ -716 +717 @@
                 switch_back %g5, %g6
                 mov %g7, %sp
-                ##      mov %sp, %fp
         
         5:
@@ -733 +733 @@
                 st %l0, [%sp + 120]
                 
-                /* Enable traps */
+                /* Enable traps (without PIL) */
                 mov %psr, %l0
                 or %l0, (1 << 5), %l0
+                or %l0, 0xf00, %l0
                 mov %l0, %psr
                 nop
@@ -747 +748 @@
                 
                 /* Jump to actual subroutine */
-                mov %g2, %o0
                 call irq_exception
                 add %sp, 128, %o1
                 
-                /* Return from handler */
+                /* Return from handler (leave PIL disabled) */
                 ld [%sp + 92], %l1
                 ld [%sp + 96], %l2
                 ld [%sp + 100], %l0
+                or %l0, 0xf00, %l0
                 mov %l0, %psr
                 nop
@@ -766 +767 @@
                  * and save uwb address for future use.
                  */
-                if_from_kernel 6f
+                if_from_kernel 9f
                 switch_to_invalid %g5, %g6
                 clr %l7
@@ -797 +798 @@
                 ba 0b
                 nop
-                
+        
         /*
          * We've restored all user space windows. Now time to
@@ -815 +816 @@
                 switch_back %g5, %g6
                 
-                /* If next window is invalid, do inline restore */
-        6:
-                get_wim_number %g6
-                get_cwp %g7
-                inc %g7
-                and %g7, 0x7, %g7
-                cmp %g6, %g7
-                bne 8f
-                
-                if_from_kernel 7f
-                
-                inline_restore_uspace %g1
-                switch_to_invalid %g5, %g6
-                mov %g1, %l6
-                switch_back %g5, %g6
-                b 8f
-                nop
-        
-        7:
-                inline_restore_kernel
-        
-        8:
+                mov %sp, %l3
+                sub %g2, 128, %sp
                 ld [%sp + 104], %g1
                 ld [%sp + 108], %g2
@@ -842 +823 @@
                 ld [%sp + 116], %g4
                 ld [%sp + 120], %g7
+                
+                mov %l3, %sp
+                b 10f
+                nop
+        
+        9:
+                inline_restore_kernel
+                
+                ld [%sp + 104], %g1
+                ld [%sp + 108], %g2
+                ld [%sp + 112], %g3
+                ld [%sp + 116], %g4
+                ld [%sp + 120], %g7
+                
+                /* Restore old sp */
+                add %sp, 128, %sp
+        
+        10:
                 jmp %l1
                 rett %l2
@@ -892 +891 @@
                 switch_back %g5, %g6
                 mov %g7, %sp
-                ##      mov %sp, %fp
+                ## mov %sp, %fp
                 
         5:
@@ -909 +908 @@
                 st %l0, [%sp + 120]
                 
-                /* Enable traps */
+                /* Enable traps (without PIL) */
                 mov %psr, %l0
                 or %l0, (1 << 5), %l0
+                or %l0, 0xf00, %l0
                 mov %l0, %psr
                 nop
@@ -933 +933 @@
                 mov %i5, %o5
                 
-                /* Return from handler */
+                /* Return from handler (with PIL disabled) */
                 ld [%sp + 92], %l1
                 ld [%sp + 96], %l2
@@ -940 +940 @@
                 mov %psr, %l1
                 and %l1, 0xf, %l1
+                or %l1, 0x00000f00, %l1
                 and %l0, 0xfffffff0, %l0
                 or %l0, %l1, %l0
@@ -1009 +1010 @@
                 ld [%sp + 116], %g4
                 ld [%sp + 120], %g7
+                
                 mov %l1, %sp
+                nop
+                nop
+                nop
+                
                 jmp %l2
                 rett %l2 + 4
@@ -1035 +1041 @@
 #define INTERRUPT(_vector, _priority) \
         .org trap_table + _vector * TRAP_ENTRY_SIZE; \
-        mov %psr, %l0 ; \
-        mov _priority, %g2 ; \
+        mov _priority, %o0 ; \
         b interrupt_trap ; \
+        nop ;
         nop ;