Changeset fd85ae5 in mainline for kernel/arch/sparc64/src/trap/trap_table.S

Timestamp:

2006-09-04T19:11:23Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fadd381

Parents:

cfa70add

Message:

sparc64 kernel fixes

File:

• kernel/arch/sparc64/src/trap/trap_table.S (modified) (7 diffs)

kernel/arch/sparc64/src/trap/trap_table.S

@@ -28 +28 @@
 
 /**
- * This file contains kernel trap table.
+ * @file
+ * @brief This file contains kernel trap table.
  */
 
@@ -85 +86 @@
 .global mem_address_not_aligned
 mem_address_not_aligned:
-        PREEMPTIBLE_HANDLER do_mem_address_not_aligned
+        MEM_ADDRESS_NOT_ALIGNED_HANDLER
 
 /* TT = 0x41, TL = 0, interrupt_level_1 handler */
@@ -461 +462 @@
 .global mem_address_not_aligned_high
 mem_address_not_aligned_high:
-        PREEMPTIBLE_HANDLER do_mem_address_not_aligned
+        MEM_ADDRESS_NOT_ALIGNED_HANDLER
 
 /* TT = 0x64, TL > 0, fast_instruction_access_MMU_miss */
@@ -525 +526 @@
  */
 .macro PREEMPTIBLE_HANDLER_TEMPLATE is_syscall
+        /*
+         * ASSERT(%tl == 1)
+         */
+        rdpr %tl, %g3
+        cmp %g3, 1
+        be 1f
+        nop
+0:      ba 0b                                   ! this for debugging, if we ever get here
+        nop                                     ! it will be easy to find
+
+1:
 .if NOT(\is_syscall)
         rdpr %tstate, %g3
@@ -536 +548 @@
         wrpr %g0, WSTATE_OTHER(0) | WSTATE_NORMAL(2), %wstate
 
+        wrpr %g0, NWINDOW - 1, %cleanwin        ! prevent unnecessary clean_window exceptions
+
         /*
          * Switch to kernel stack. The old stack is
@@ -555 +569 @@
         /*
          * Mark the CANRESTORE windows as OTHER windows.
-         * Set CLEANWIN to NWINDOW-1 so that clean_window traps do not occur.
          */
         rdpr %canrestore, %l0
         wrpr %l0, %otherwin
         wrpr %g0, %canrestore
-        wrpr %g0, NWINDOW - 1, %cleanwin
 
         /*
@@ -727 +739 @@
         ldxa [VA_SECONDARY_CONTEXT_REG] %asi, %g1
         stxa %g1, [VA_PRIMARY_CONTEXT_REG] %asi
-        flush %o7
+        rd %pc, %g1
+        flush %g1
         
         rdpr %cwp, %g1