Changeset e692a27 in mainline

Timestamp:

2006-04-22T22:35:37Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

cf85e24c

Parents:

c118940

Message:

ppc32: initial userspace support

Location:

arch/ppc32

Files:

• Makefile.inc (modified) (1 diff)
• include/asm.h (modified) (1 diff)
• include/boot/boot.h (modified) (2 diffs)
• src/asm.S (modified) (1 diff)
• src/dummy.s (modified) (1 diff)
• src/ppc32.c (modified) (3 diffs)

arch/ppc32/Makefile.inc

@@ -79 +79 @@
         arch/$(ARCH)/src/mm/frame.c \
         arch/$(ARCH)/src/mm/memory_init.c \
-        arch/$(ARCH)/src/mm/page.c  \
-        arch/$(ARCH)/src/mm/tlb.c 
+        arch/$(ARCH)/src/mm/page.c \
+        arch/$(ARCH)/src/mm/tlb.c

arch/ppc32/include/asm.h

@@ -133 +133 @@
 void asm_delay_loop(__u32 t);
 
+extern void userspace_asm(__address uspace_uarg, __address stack, __address entry);
+
 #endif

arch/ppc32/include/boot/boot.h

@@ -42 +42 @@
 
 typedef struct {
+        __address addr;
+        __u32 size;
+} utask_t;
+
+typedef struct {
         __address start;
         __u32 size;
@@ -61 +66 @@
 
 typedef struct {
+        utask_t init;
         memmap_t memmap;
         screen_t screen;

arch/ppc32/src/asm.S

@@ -31 +31 @@
 .text
 
+.global userspace_asm
 .global iret
 .global memsetb
 .global memcpy
+
+userspace_asm:
+
+        # r3 = uspace_uarg
+        # r4 = stack
+        # r5 = entry    
+
+        mfmsr r31
+        rlwinm r31, r31, 0, 17, 15
+        mtmsr r31
+        
+        # set entry point
+        
+        mtsrr0 r5
+        
+        # set problem state, enable interrupts
+        
+        ori r31, r31, 1 << 14
+        ori r31, r31, 1 << 15
+        mtsrr1 r31
+        
+        # set stack
+        
+        mr sp, r4
+        
+        # jump to userspace
+        
+        rfi
 
 iret:

arch/ppc32/src/dummy.s

@@ -45 +45 @@
         b tlb_invalidate_pages
 
-userspace:
-        b userspace
-
 sys_tls_set:
         b sys_tls_set

arch/ppc32/src/ppc32.c

@@ -33 +33 @@
 #include <arch/mm/memory_init.h>
 #include <arch/interrupt.h>
+#include <userspace.h>
+#include <proc/uarg.h>
 
 bootinfo_t bootinfo;
@@ -46 +48 @@
         ppc32_console_init();
         cuda_init();
+        
+        /* Setup usermode */
+        init.cnt = 1;
+        init.tasks[0].addr = PA2KA(bootinfo.init.addr);
+        init.tasks[0].size = bootinfo.init.size;
 }
 
@@ -65 +72 @@
 }
 
+void userspace(uspace_arg_t *kernel_uarg)
+{
+        userspace_asm((__address) kernel_uarg->uspace_uarg, (__address) kernel_uarg->uspace_stack, (__address) kernel_uarg->uspace_entry);
+        
+        /* Unreachable */
+        for (;;)
+                ;
+}