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

Timestamp:

2006-08-31T18:53:14Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6767c1d

Parents:

e0b241f

Message:

A lot of untested sparc64 stuff:

• Write ASID to hardware when a thread is about to run in userspace.
• Add userspace() and switch_to_userspace() functions.
• Handle special cases when the userspace spill/fill handler causes MMU trap.
• Resolve some TODOs in the existing sparc64 code.
• sparc64 has now C99 compliant header guards.
• Formatting and indentation fixes.

File:

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

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

@@ -41 +41 @@
 #include <arch/trap/exception.h>
 #include <arch/trap/mmu.h>
+#include <arch/mm/mmu.h>
 #include <arch/mm/page.h>
 #include <arch/stack.h>
@@ -349 +350 @@
         wrpr %l0, %otherwin
         wrpr %g0, %cansave
-        wrpr %g0, NWINDOW-1, %cleanwin
+        wrpr %g0, NWINDOW - 1, %cleanwin
 
         /*
@@ -355 +356 @@
          */
         mov VA_PRIMARY_CONTEXT_REG, %l0
-        stxa %g0, [%l0] ASI_DMMU
-        set kernel_image_start, %l0
-        flush %l0
+        stxa %g0, [%l0] ASI_DMMU
+        rd %pc, %l0
+        flush %l0
 
         ba 1f
@@ -498 +499 @@
          */
         wrpr %g0, WSTATE_OTHER(0) | WSTATE_NORMAL(1), %wstate
+
+        /*
+         * Set primary context according to secondary context.
+         */
+        wr %g0, ASI_DMMU, %asi
+        ldxa [VA_SECONDARY_CONTEXT_REG] %asi, %g1
+        stxa %g1, [VA_PRIMARY_CONTEXT_REG] %asi
+        flush %o7
         
         rdpr %cwp, %g1