Changeset 99de22b in mainline for kernel/arch/sparc64

Timestamp:

2010-01-15T18:30:25Z (16 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

eeb643d

Parents:

387416b (diff), 563d6077 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged latest trunk changes.

Location:

kernel/arch/sparc64

Files:

• Makefile.inc (modified) (1 diff)
• _link.ld.in (modified) (1 diff)
• include/interrupt.h (modified) (2 diffs)
• src/context.S (modified) (3 diffs)
• src/debug/stacktrace.c (added)
• src/debug/stacktrace_asm.S (added)
• src/trap/sun4u/trap_table.S (modified) (1 diff)

kernel/arch/sparc64/Makefile.inc

@@ -65 +65 @@
 ARCH_SOURCES = \
         arch/$(KARCH)/src/cpu/$(USARCH)/cpu.c \
+        arch/$(KARCH)/src/debug/stacktrace.c \
+        arch/$(KARCH)/src/debug/stacktrace_asm.S \
         arch/$(KARCH)/src/asm.S \
         arch/$(KARCH)/src/$(USARCH)/asm.S \

kernel/arch/sparc64/_link.ld.in

@@ -36 +36 @@
                 *(COMMON);                  /* global variables */
                 
+                . = ALIGN(8);
                 symbol_table = .;
                 *(symtab.*);                /* Symbol table, must be LAST symbol!*/

kernel/arch/sparc64/include/interrupt.h

@@ -50 +50 @@
 };              
 
-typedef struct {
+typedef struct istate {
         uint64_t        tnpc;
         uint64_t        tpc;
@@ -71 +71 @@
 }
 
+static inline unative_t istate_get_fp(istate_t *istate)
+{
+        return 0;       /* TODO */
+}
+
 #endif
 

kernel/arch/sparc64/src/context.S

@@ -28 +28 @@
 
 #include <arch/context_offset.h>
-
-/**
- * Both context_save_arch() and context_restore_arch() are
- * leaf-optimized procedures. This kind of optimization
- * is very important and prevents any implicit window
- * spill/fill/clean traps in these very core kernel
- * functions.
- */
-        
-#include <arch/context_offset.h>
+#include <arch/arch.h>
+#include <arch/regdef.h>
 
 .text   
@@ -44 +36 @@
 .global context_restore_arch
 
+/*
+ * context_save_arch() is required not to create its own stack frame. See the
+ * generic context.h for explanation.
+ */
 context_save_arch:
+        #
+        # Force all our active register windows to memory so that we can find
+        # them there even if e.g. the thread is migrated to another processor.
+        #
+        flushw
+
         CONTEXT_SAVE_ARCH_CORE %o0
         retl
@@ -51 +53 @@
 context_restore_arch:
         #
-        # Flush all active windows.
-        # This is essential, because CONTEXT_LOAD overwrites
-        # %sp of CWP - 1 with the value written to %fp of CWP.
-        # Flushing all active windows mitigates this problem
-        # as CWP - 1 becomes the overlap window.
+        # Forget all previous windows, they are not going to be needed again.
+        # Enforce a window fill on the next RESTORE instruction by setting
+        # CANRESTORE to zero and other window configuration registers
+        # accordingly. Note that the same can be achieved by executing the
+        # FLUSHW instruction, but since we don't need to remember the previous
+        # windows, we do the former and save thus some unnecessary window
+        # spills.
         #
-        flushw
-        
+        rdpr %pstate, %l0
+        andn %l0, PSTATE_IE_BIT, %l1
+        wrpr %l1, %pstate
+        wrpr %g0, 0, %canrestore
+        wrpr %g0, 0, %otherwin
+        wrpr %g0, NWINDOWS - 2, %cansave
+        wrpr %l0, %pstate
+
         CONTEXT_RESTORE_ARCH_CORE %o0
         retl

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

@@ -652 +652 @@
          * 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().
+         * belonging to other threads were spilled by context_save().
          * If OTHERWIN is non-zero, then some userspace windows are still
          * valid. Others might have been spilled. However, the CWP pointer