Changeset 44c259c in mainline

Timestamp:

2006-01-15T18:35:45Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

77147d6

Parents:

ae10582

Message:

remove obsolete in-kernel userspace code
remove CONFIG_USERSPACE switch, uspace support is configured at run-time

Files:

• Makefile (modified) (1 diff)
• arch/amd64/src/asm_utils.S (modified) (2 diffs)
• arch/ia32/src/asm.S (modified) (1 diff)
• arch/mips32/src/asm.S (modified) (1 diff)
• generic/include/main/uinit.h (modified) (1 diff)
• generic/src/main/kinit.c (modified) (3 diffs)
• kernel.config (modified) (1 diff)

Makefile

@@ -69 +69 @@
 ifeq ($(CONFIG_DEBUG_SPINLOCK),y)
         DEFS += -DCONFIG_DEBUG_SPINLOCK
-endif
-ifeq ($(CONFIG_USERSPACE),y)
-        DEFS += -DCONFIG_USERSPACE
 endif
 ifeq ($(CONFIG_FPU_LAZY),y)

arch/amd64/src/asm_utils.S

@@ -53 +53 @@
 .global read_efer_flag
 .global set_efer_flag
-        
-
-# THIS IS USERSPACE CODE
-.global utext
-utext:
-0:
-        int $48
-        jmp 0b
-        # not reached
-utext_end:
-
-.data
-.global utext_size
-utext_size:
-        .long utext_end - utext 
-
         
 ## Determine CPUID support
@@ -208 +192 @@
 h_end:
         
-        
 .data
 .global interrupt_handler_size

arch/ia32/src/asm.S

@@ -149 +149 @@
 h_end:
 
-
-# THIS IS USERSPACE CODE
-.global utext
-utext:
-        xor %ax,%ax
-        mov %ax,%ds
-        mov %ax,%es
-        mov %ax,%fs
-        mov %ax,%gs
-0:
-        int $48
-        jmp 0b
-        # not reached
-utext_end:
-
 .data
-.global utext_size
-utext_size:
-        .long utext_end - utext 
-
 .global interrupt_handler_size
 

arch/mips32/src/asm.S

@@ -296 +296 @@
         j $ra
         nop
-        
-# THIS IS USERSPACE CODE
-.global utext
-utext:
-        j $31
-        nop
-utext_end:
-
-.data
-.global utext_size
-utext_size:
-        .long utext_end-utext
- 
-

generic/include/main/uinit.h

@@ -32 +32 @@
 #include <arch/types.h>
 
-extern void utext(void);
-extern __u32 utext_size;  
-
 extern void uinit(void *arg);
 

generic/src/main/kinit.c

@@ -70 +70 @@
 {
         thread_t *t;
-#ifdef CONFIG_USERSPACE
         as_t *as;
         as_area_t *a;
@@ -76 +75 @@
         index_t pfn[1];
         task_t *u;
-#endif
 
         interrupts_disable();
@@ -140 +138 @@
         interrupts_enable();
 
-#ifdef CONFIG_USERSPACE
-        /*
-         * Create the first user task.
-         */
-        as = as_create(NULL);
-        if (!as)
-                panic("as_create\n");
-        u = task_create(as);
-        if (!u)
-                panic("task_create\n");
-        t = thread_create(uinit, NULL, u, THREAD_USER_STACK);
-        if (!t)
-                panic("thread_create\n");
-
-        /*
-         * Create the text as_area and copy the userspace code there.
-         */     
-        a = as_area_create(as, AS_AREA_TEXT, 1, UTEXT_ADDRESS);
-        if (!a)
-                panic("as_area_create: text\n");
-
-        frame = frame_alloc(0, ONE_FRAME, NULL);
-
-        if (config.init_size > 0)
+        if (config.init_size > 0) {
+                /*
+                 * Create the first user task.
+                 */
+                as = as_create(NULL);
+                if (!as)
+                        panic("as_create\n");
+                u = task_create(as);
+                if (!u)
+                        panic("task_create\n");
+                t = thread_create(uinit, NULL, u, THREAD_USER_STACK);
+                if (!t)
+                        panic("thread_create\n");
+                
+                /*
+                 * Create the text as_area and copy the userspace code there.
+                 */     
+                a = as_area_create(as, AS_AREA_TEXT, 1, UTEXT_ADDRESS);
+                if (!a)
+                        panic("as_area_create: text\n");
+                
+                // FIXME: Better way to initialize static code/data
+                frame = frame_alloc(0, ONE_FRAME, NULL);
                 memcpy((void *) PA2KA(frame), (void *) config.init_addr, config.init_size < PAGE_SIZE ? config.init_size : PAGE_SIZE);
-        else
-                memcpy((void *) PA2KA(frame), (void *) utext, utext_size < PAGE_SIZE ? utext_size : PAGE_SIZE);
+                
+                pfn[0] = frame / FRAME_SIZE;
+                as_area_load_mapping(a, pfn);
         
-        pfn[0] = frame / FRAME_SIZE;
-        as_area_load_mapping(a, pfn);
-
-        /*
-         * Create the data as_area.
-         */
-        a = as_area_create(as, AS_AREA_STACK, 1, USTACK_ADDRESS);
-        if (!a)
-                panic("as_area_create: stack\n");
+                /*
+                 * Create the data as_area.
+                 */
+                a = as_area_create(as, AS_AREA_STACK, 1, USTACK_ADDRESS);
+                if (!a)
+                        panic("as_area_create: stack\n");
         
-        thread_ready(t);
-#endif /* CONFIG_USERSPACE */
+                thread_ready(t);
+        }
 
 #ifdef CONFIG_TEST

kernel.config

@@ -64 +64 @@
 ## Run-time configuration directives
 
-# Enable user space support
-! CONFIG_USERSPACE (n/y)
-
 # Kernel test type
 @ "" No test