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

Timestamp:

2006-09-03T23:37:14Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fd85ae5

Parents:

002e613

Message:

sparc64 update.

• Prototype userspace layer implementation that at least relates to sparc64 and compiles cleanly.
• Fixes for kernel's preemptible_handler and code related to running userspace.
• Enable userspace. Several dozen instructions are now run in userspace! We are pretty near the userspace milestone for sparc64.

File:

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

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

@@ -219 +219 @@
         SPILL_TO_USPACE_WINDOW_BUFFER
 
+/* TT = 0xa0, TL = 0, spill_0_other handler */
+.org trap_table + TT_SPILL_0_OTHER*ENTRY_SIZE
+.global spill_0_other
+spill_0_other:
+        SPILL_TO_USPACE_WINDOW_BUFFER
+
 /* TT = 0xc0, TL = 0, fill_0_normal handler */
 .org trap_table + TT_FILL_0_NORMAL*ENTRY_SIZE
@@ -548 +554 @@
 
         /*
-         * Mark the CANSAVE windows as OTHER windows.
+         * Mark the CANRESTORE windows as OTHER windows.
          * Set CLEANWIN to NWINDOW-1 so that clean_window traps do not occur.
          */
-        rdpr %cansave, %l0
+        rdpr %canrestore, %l0
         wrpr %l0, %otherwin
-        wrpr %g0, %cansave
+        wrpr %g0, %canrestore
         wrpr %g0, NWINDOW - 1, %cleanwin
 
@@ -642 +648 @@
         /*
          * If OTHERWIN is zero, then all the userspace windows have been
-         * spilled to kernel memory (i.e. register window buffer). If
-         * OTHERWIN is non-zero, then some userspace windows are still
+         * spilled to kernel memory (i.e. register window buffer). Moreover,
+         * if the scheduler was called in the meantime, all valid windows
+         * belonging to other threads were spilled by context_restore().
+         * If OTHERWIN is non-zero, then some userspace windows are still
          * valid. Others might have been spilled. However, the CWP pointer
          * needs no fixing because the scheduler had not been called.
@@ -660 +668 @@
         and %g1, TSTATE_CWP_MASK, %l0
         inc %l0
-        and %l0, TSTATE_CWP_MASK, %l0   ! %l0 mod NWINDOW
+        and %l0, NWINDOW - 1, %l0       ! %l0 mod NWINDOW
         rdpr %cwp, %l1
         cmp %l0, %l1
@@ -668 +676 @@
         /*
          * Fix CWP.
-         * Just for reminder, the input registers in the current window
-         * are the output registers of the window to which we want to
-         * restore. Because the fill trap fills only input and local
+         * In order to recapitulate, the input registers in the current
+         * window are the output registers of the window to which we want
+         * to restore. Because the fill trap fills only input and local
          * registers of a window, we need to preserve those output
          * registers manually.
          */
-        flushw
         mov %sp, %g2
         stx %i0, [%sp + PREEMPTIBLE_HANDLER_STACK_FRAME_SIZE + STACK_BIAS + SAVED_I0]
@@ -739 +746 @@
          */
         clr %g4
-0:      andcc %g7, PAGE_WIDTH - 1, %g0          ! PAGE_SIZE alignment check
+        set PAGE_SIZE - 1, %g5
+0:      andcc %g7, %g5, %g0                     ! PAGE_SIZE alignment check
         bz 0f                                   ! %g7 is page-aligned, no more windows to refill
         nop