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

Timestamp:

2006-09-13T13:16:30Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

34d9469e

Parents:

9a5b556

Message:

Support for sparc64 FPU context.

File:

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

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

@@ -83 +83 @@
         PREEMPTIBLE_HANDLER privileged_opcode
 
+/* TT = 0x20, TL = 0, fb_disabled handler */
+.org trap_table + TT_FP_DISABLED*ENTRY_SIZE
+.global fb_disabled_tl0
+fp_disabled_tl0:
+        PREEMPTIBLE_HANDLER fp_disabled
+
 /* TT = 0x24, TL = 0, clean_window handler */
 .org trap_table + TT_CLEAN_WINDOW*ENTRY_SIZE
-.global clean_window_handler_tl0
-clean_window_handler_tl0:
+.global clean_window_tl0
+clean_window_tl0:
         CLEAN_WINDOW_HANDLER
 
@@ -490 +496 @@
 /* TT = 0x24, TL > 0, clean_window handler */
 .org trap_table + (TT_CLEAN_WINDOW+512)*ENTRY_SIZE
-.global clean_window_handler_tl1
-clean_window_handler_tl1:
+.global clean_window_tl1
+clean_window_tl1:
         CLEAN_WINDOW_HANDLER
 
@@ -689 +695 @@
         
         wrpr %g0, 0, %tl
-        wrpr %g0, PSTATE_PRIV_BIT, %pstate
+        wrpr %g0, PSTATE_PRIV_BIT | PSTATE_PEF_BIT, %pstate
         SAVE_GLOBALS
         
@@ -706 +712 @@
 
         RESTORE_GLOBALS
+        rdpr %pstate, %l1                       ! we must preserve the PEF bit
         wrpr %g0, PSTATE_AG_BIT | PSTATE_PRIV_BIT, %pstate
         wrpr %g0, 1, %tl
@@ -717 +724 @@
 
         /*
+         * Copy PSTATE.PEF to the in-register copy of TSTATE.
+         */
+        and %l1, PSTATE_PEF_BIT, %l1
+        sllx %l1, TSTATE_PSTATE_SHIFT, %l1
+        sethi %hi(TSTATE_PEF_BIT), %g4
+        andn %g1, %g4, %g1
+        or %g1, %l1, %g1
+
+        /*
          * Restore TSTATE, TPC and TNPC from saved copies.
          */
@@ -722 +738 @@
         wrpr %g2, 0, %tpc
         wrpr %g3, 0, %tnpc
+
 
         /*