Changeset a218709 in mainline for kernel/arch/sparc32/include

Timestamp:

2013-12-02T23:45:45Z (12 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

2955bb9

Parents:

3bc42bd

Message:

Implement new userspace window trap mechanism, which utilizes MMU probe
to choose between slow (preemptive, involving inserting stack page mapping)
and fast (direct) handlers.

Location:

kernel/arch/sparc32/include/arch

Files:

• arch.h (modified) (2 diffs)
• asm.h (modified) (2 diffs)
• context.h (modified) (1 diff)
• faddr.h (modified) (1 diff)
• regwin.h (modified) (1 diff)

kernel/arch/sparc32/include/arch/arch.h

@@ -40 +40 @@
 
 #include <typedefs.h>
+#include <arch/istate.h>
 
 #define NWINDOWS        8
@@ -76 +77 @@
 extern void arch_pre_main(void *unused, bootinfo_t *bootinfo);
 extern void write_to_invalid(uint32_t l0, uint32_t l1, uint32_t l2);
+extern void read_from_invalid(uint32_t *l0, uint32_t *l1, uint32_t *l2);
+extern void preemptible_save_uspace(uintptr_t sp, istate_t *istate);
+extern void preemptible_restore_uspace(uintptr_t sp, istate_t *istate);
+extern void flush_windows(void);
 
 #endif

kernel/arch/sparc32/include/arch/asm.h

@@ -145 +145 @@
 }
 
+NO_TRACE static inline uint32_t wim_read()
+{
+        uint32_t v;
+
+        asm volatile (
+                "mov %%wim, %[v]\n"
+                : [v] "=r" (v)
+        );
+
+        return v;
+}
+
 NO_TRACE static inline uint32_t asi_u32_read(int asi, uintptr_t va)
 {
@@ -178 +190 @@
 }
 
+NO_TRACE static inline void wim_write(uint32_t wim)
+{
+        asm volatile (
+                "mov %[v], %%wim\n"
+                :: [v] "r" (wim)
+        );
+}
+
 NO_TRACE static inline ipl_t interrupts_enable(void)
 {

kernel/arch/sparc32/include/arch/context.h

@@ -45 +45 @@
 #define context_set(c, _pc, stack, size) \
         do { \
-                (c)->pc = ((uintptr_t) _pc) - 4; \
+                (c)->pc = ((uintptr_t) _pc) - 8; \
                 (c)->sp = ((uintptr_t) stack) + ALIGN_UP((size), \
                     STACK_ALIGNMENT) - (SP_DELTA); \

kernel/arch/sparc32/include/arch/faddr.h

@@ -33 +33 @@
  */
 
-#ifndef KERN_abs32le_FADDR_H_
-#define KERN_abs32le_FADDR_H_
+#ifndef KERN_sparc32_FADDR_H_
+#define KERN_sparc32_FADDR_H_
 
 #include <typedefs.h>

kernel/arch/sparc32/include/arch/regwin.h

@@ -42 +42 @@
 #include <align.h>
 
-#define CLEAN_WINDOW_HANDLER_SIZE       REGWIN_HANDLER_SIZE
-#define SPILL_HANDLER_SIZE              REGWIN_HANDLER_SIZE
-#define FILL_HANDLER_SIZE               REGWIN_HANDLER_SIZE
+#define UWB_ALIGNMENT   1024
 
 /* Window Save Area offsets. */