Changeset 84060e2 in mainline for kernel/arch/sparc64/src/trap

Timestamp:

2006-10-09T19:29:42Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8ce8499

Parents:

e4398200

Message:

sparc64 work:

• hw_map() can now support up to 8M requests
• CPU stacks are now locked in DTLB of the respective processor
• kernel in the boot phase no longer relies on the stack provided by OpenFirmware
• instead of of doing FLUSHW during kernel startup, simply set the window state registers to the wanted state
• NWINDOW → NWINDOWS
• Add/fix some comments and copyrights.

File:

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

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

@@ -674 +674 @@
         wrpr %g0, WSTATE_OTHER(0) | WSTATE_NORMAL(2), %wstate
 
-        wrpr %g0, NWINDOW - 1, %cleanwin        ! prevent unnecessary clean_window exceptions
+        wrpr %g0, NWINDOWS - 1, %cleanwin       ! prevent unnecessary clean_window exceptions
 
         /*
@@ -831 +831 @@
         and %g1, TSTATE_CWP_MASK, %l0
         inc %l0
-        and %l0, NWINDOW - 1, %l0       ! %l0 mod NWINDOW
+        and %l0, NWINDOWS - 1, %l0      ! %l0 mod NWINDOWS
         rdpr %cwp, %l1
         cmp %l0, %l1
@@ -902 +902 @@
         sub %g1, %g2, %g3
         dec %g3
-        and %g3, NWINDOW - 1, %g3
+        and %g3, NWINDOWS - 1, %g3
         wrpr %g3, 0, %cwp
 
@@ -934 +934 @@
 
         dec %g3
-        and %g3, NWINDOW - 1, %g3
+        and %g3, NWINDOWS - 1, %g3
         wrpr %g3, 0, %cwp                       ! switch to the preceeding window
 
@@ -947 +947 @@
         wrpr %g1, 0, %cwp
         add %g4, %g2, %g2
-        cmp %g2, NWINDOW - 2
-        bg 2f                                   ! fix the CANRESTORE=NWINDOW-1 anomaly
-        mov NWINDOW - 2, %g1                    ! use dealy slot for both cases
+        cmp %g2, NWINDOWS - 2
+        bg 2f                                   ! fix the CANRESTORE=NWINDOWS-1 anomaly
+        mov NWINDOWS - 2, %g1                   ! use dealy slot for both cases
         sub %g1, %g2, %g1
         
         wrpr %g0, 0, %otherwin
-        wrpr %g1, 0, %cansave                   ! NWINDOW - 2 - CANRESTORE
+        wrpr %g1, 0, %cansave                   ! NWINDOWS - 2 - CANRESTORE
         wrpr %g2, 0, %canrestore                ! OTHERWIN + windows in the buffer
         wrpr %g2, 0, %cleanwin                  ! avoid information leak
@@ -973 +973 @@
          *
          * instruction trapped and spilled a register window into the userspace
-         * window buffer, we have just restored NWINDOW - 1 register windows.
+         * window buffer, we have just restored NWINDOWS - 1 register windows.
          * However, CANRESTORE can be only NWINDOW - 2 at most.
          *
-         * The solution is to manually switch to (CWP - 1) mod NWINDOW
+         * The solution is to manually switch to (CWP - 1) mod NWINDOWS
          * and set the window state registers so that:
          *
-         *      CANRESTORE      = NWINDOW - 2
-         *      CLEANWIN        = NWINDOW - 2
+         *      CANRESTORE      = NWINDOWS - 2
+         *      CLEANWIN        = NWINDOWS - 2
          *      CANSAVE         = 0
          *      OTHERWIN        = 0
@@ -994 +994 @@
         rdpr %cwp, %g1
         dec %g1
-        and %g1, NWINDOW - 1, %g1
+        and %g1, NWINDOWS - 1, %g1
         wrpr %g1, 0, %cwp                       ! CWP--