Changeset de6b301 in mainline

Timestamp:

2006-03-12T18:27:33Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f972b89

Parents:

a82500ce

Message:

Basic support for loading ELF object files.
ia64, amd64, ia32 working.
mips32 requires some attention.

Files:

• Makefile (modified) (1 diff)
• arch/amd64/Makefile.inc (modified) (1 diff)
• arch/amd64/_link.ld.in (modified) (1 diff)
• arch/amd64/include/elf.h (modified) (1 diff)
• arch/amd64/include/types.h (modified) (1 diff)
• arch/amd64/src/userspace.c (modified) (2 diffs)
• arch/ia32/Makefile.inc (modified) (1 diff)
• arch/ia32/include/elf.h (modified) (1 diff)
• arch/ia32/include/types.h (modified) (1 diff)
• arch/ia32/src/userspace.c (modified) (2 diffs)
• arch/ia64/Makefile.inc (modified) (1 diff)
• arch/ia64/include/elf.h (modified) (1 diff)
• arch/ia64/src/ia64.c (modified) (2 diffs)
• arch/mips32/Makefile.inc (modified) (3 diffs)
• arch/mips32/include/elf.h (modified) (2 diffs)
• arch/mips32/src/mips32.c (modified) (2 diffs)
• arch/ppc32/Makefile.inc (modified) (1 diff)
• arch/ppc32/include/elf.h (modified) (2 diffs)
• arch/ppc32/include/types.h (modified) (1 diff)
• arch/sparc64/Makefile.inc (modified) (1 diff)
• arch/sparc64/include/elf.h (modified) (2 diffs)
• contrib/conf/msim.conf (modified) (1 diff)
• contrib/conf/ski.conf (modified) (1 diff)
• contrib/conf/spmips.conf (modified) (1 diff)
• generic/include/elf.h (modified) (1 diff)
• generic/include/elf32.h (deleted)
• generic/include/elf64.h (deleted)
• generic/include/userspace.h (modified) (1 diff)
• generic/src/lib/elf.c (added)
• generic/src/lib/elf32.c (deleted)
• generic/src/lib/elf64.c (deleted)
• generic/src/main/kinit.c (modified) (3 diffs)
• generic/src/main/uinit.c (modified) (1 diff)

Makefile ¶

@@ -121 +121 @@
         generic/src/lib/memstr.c \
         generic/src/lib/sort.c \
-        generic/src/lib/elf32.c \
-        generic/src/lib/elf64.c \
+        generic/src/lib/elf.c \
         generic/src/debug/print.c \
         generic/src/debug/symtab.c \

arch/amd64/Makefile.inc ¶

@@ -44 +44 @@
 
 CFLAGS += -fno-unwind-tables -m64 -mcmodel=kernel -mno-red-zone
-DEFS += -D_CPU=${CPU}
+DEFS += -D_CPU=${CPU} -D__64_BITS__
 
 ## Accepted CPUs

arch/amd64/_link.ld.in ¶

@@ -55 +55 @@
         
 #ifdef CONFIG_SMP       
-        
         _hardcoded_unmapped_size = (unmapped_ktext_end - unmapped_ktext_start) + (unmapped_kdata_end - unmapped_kdata_start);
         ap_boot = unmapped_ap_boot - BOOT_OFFSET + AP_BOOT_OFFSET;

arch/amd64/include/elf.h ¶

@@ -30 +30 @@
 #define __amd64_ELF_H__
 
-#include <elf64.h>
-
 #define ELF_MACHINE             EM_X86_64
 #define ELF_DATA_ENCODING       ELFDATA2LSB
 #define ELF_CLASS               ELFCLASS64
 
-/*
- * Main ELF loader function
- */
-#define elf_load(header, as) elf64_load(header, as)
-
 #endif

arch/amd64/include/types.h ¶

@@ -33 +33 @@
 
 typedef signed char __s8;
+typedef signed short __s16;
+typedef signed int __s32;
+typedef signed long long __s64;
 
 typedef unsigned char __u8;

arch/amd64/src/userspace.c ¶

@@ -40 +40 @@
  *
  */
-void userspace(void)
+void userspace(__address entry)
 {
         ipl_t ipl;
@@ -62 +62 @@
                           "r" (ipl), 
                           "i" (gdtselector(UTEXT_DES) | PL_USER), 
-                          "i" (UTEXT_ADDRESS));
+                          "r" (entry));
         
         /* Unreachable */

arch/ia32/Makefile.inc ¶

@@ -43 +43 @@
 endif
 
-DEFS += -D_CPU=${IA32_CPU}
+DEFS += -D_CPU=${IA32_CPU} -D__32_BITS__
 
 ## Accepted CPUs

arch/ia32/include/elf.h ¶

@@ -30 +30 @@
 #define __ia32_ELF_H__
 
-#include <elf32.h>
-
 #define ELF_MACHINE             EM_386
 #define ELF_DATA_ENCODING       ELFDATA2LSB
 #define ELF_CLASS               ELFCLASS32
 
-/*
- * Main ELF loader function
- */
-#define elf_load(header, as) elf32_load(header, as)
-
 #endif

arch/ia32/include/types.h ¶

@@ -33 +33 @@
 
 typedef signed char __s8;
+typedef signed short __s16;
+typedef signed long __s32;
+typedef signed long long __s64;
 
 typedef unsigned char __u8;
 typedef unsigned short __u16;
 typedef unsigned long __u32;
-typedef long long __u64;
+typedef unsigned long long __u64;
 
 typedef __u32 __address;

arch/ia32/src/userspace.c ¶

@@ -40 +40 @@
  *
  */
-void userspace(void)
+void userspace(__address entry)
 {
         ipl_t ipl;
@@ -61 +61 @@
                 "iret"
                 : 
-                : "i" (selector(UDATA_DES) | PL_USER), "r" (USTACK_ADDRESS+(THREAD_STACK_SIZE)), "r" (ipl), "i" (selector(UTEXT_DES) | PL_USER), "i" (UTEXT_ADDRESS)
+                : "i" (selector(UDATA_DES) | PL_USER), "r" (USTACK_ADDRESS+(THREAD_STACK_SIZE)), "r" (ipl), "i" (selector(UTEXT_DES) | PL_USER), "r" (entry)
                 : "eax");
         

arch/ia64/Makefile.inc ¶

@@ -46 +46 @@
 AFLAGS += -mconstant-gp
 
-DEFS += -DINIT_ADDRESS=$(INIT_ADDRESS) -DINIT_SIZE=$(INIT_SIZE)
+DEFS += -D__64_BITS__ -DINIT_ADDRESS=$(INIT_ADDRESS) -DINIT_SIZE=$(INIT_SIZE)
 
 ## Compile with page hash table support.

arch/ia64/include/elf.h ¶

@@ -30 +30 @@
 #define __ia64_ELF_H__
 
-#include <elf64.h>
-
 #define ELF_MACHINE             EM_IA_64
 #define ELF_DATA_ENCODING       ELFDATA2LSB
 #define ELF_CLASS               ELFCLASS64
 
-/*
- * Main ELF loader function
- */
-#define elf_load(header, as) elf64_load(header, as)
-
 #endif

arch/ia64/src/ia64.c ¶

@@ -67 +67 @@
 
 /** Enter userspace and never return. */
-void userspace(void)
+void userspace(__address entry)
 {
         psr_t psr;
@@ -84 +84 @@
         rsc.mode = 3;                           /* eager mode */
 
-        switch_to_userspace(UTEXT_ADDRESS, USTACK_ADDRESS+PAGE_SIZE-1, USTACK_ADDRESS, psr.value, rsc.value);
+        switch_to_userspace(entry, USTACK_ADDRESS+PAGE_SIZE-1, USTACK_ADDRESS, psr.value, rsc.value);
 
         while (1) {

arch/mips32/Makefile.inc ¶

@@ -42 +42 @@
 
 KERNEL_LOAD_ADDRESS = 0x80100000
-INIT_ADDRESS = 0x20000000
+INIT_ADDRESS = 0x81000000
 INIT_SIZE = 65536
 
 CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss
 
-DEFS += -DMACHINE=${MIPS_MACHINE} -DKERNEL_LOAD_ADDRESS=${KERNEL_LOAD_ADDRESS} -DINIT_ADDRESS=${INIT_ADDRESS} -DINIT_SIZE=${INIT_SIZE}
+DEFS += -D__32_BITS__ -DMACHINE=${MIPS_MACHINE} -DKERNEL_LOAD_ADDRESS=${KERNEL_LOAD_ADDRESS} -DINIT_ADDRESS=${INIT_ADDRESS} -DINIT_SIZE=${INIT_SIZE}
 
 ## Compile with hierarchical page tables support.
@@ -81 +81 @@
         BFD = ecoff-littlemips
         CFLAGS += -DARCH_HAS_FPU -mips3
-        INIT_ADDRESS = 0x1800000
+        INIT_ADDRESS = 0x81800000
 endif
 ifeq ($(MIPS_MACHINE),bgxemul)
@@ -89 +89 @@
         TOOLCHAIN_DIR = /usr/local/mips/bin
         CFLAGS += -EB -DBIG_ENDIAN -DARCH_HAS_FPU -mips3
-        INIT_ADDRESS = 0x1800000
+        INIT_ADDRESS = 0x81800000
 endif
 ifeq ($(MIPS_MACHINE),simics)

arch/mips32/include/elf.h ¶

@@ -27 +27 @@
  */
 
-#ifndef __ia32_ELF_H__
-#define __ia32_ELF_H__
-
-#include <elf32.h>
+#ifndef __mips32_ELF_H__
+#define __mips32_ELF_H__
 
 #define ELF_MACHINE             EM_MIPS
@@ -36 +34 @@
 #define ELF_CLASS               ELFCLASS32
 
-/*
- * Main ELF loader function
- */
-#define elf_load(header, as) elf32_load(header, as)
-
 #endif

arch/mips32/src/mips32.c ¶

@@ -119 +119 @@
 __address supervisor_sp __attribute__ ((section (".text")));
 
-void userspace(void)
+void userspace(__address entry)
 {
         /* EXL=1, UM=1, IE=1 */
@@ -125 +125 @@
                                               cp0_status_um_bit |
                                               cp0_status_ie_enabled_bit));
-        cp0_epc_write(UTEXT_ADDRESS);
+        cp0_epc_write(entry);
         userspace_asm(USTACK_ADDRESS+PAGE_SIZE);
         while (1)

arch/ppc32/Makefile.inc ¶

@@ -41 +41 @@
 LFLAGS += -no-check-sections -N
 
+DEFS += -D__32_BITS__
+
 ## Own configuration directives
 #

arch/ppc32/include/elf.h ¶

@@ -27 +27 @@
  */
 
-#ifndef __ia32_ELF_H__
-#define __ia32_ELF_H__
-
-#include <elf32.h>
+#ifndef __ppc32_ELF_H__
+#define __ppc32_ELF_H__
 
 #define ELF_MACHINE             EM_PPC
@@ -36 +34 @@
 #define ELF_CLASS               ELFCLASS32
 
-/*
- * Main ELF loader function
- */
-#define elf_load(header, as) elf32_load(header, as)
-
 #endif

arch/ppc32/include/types.h ¶

@@ -33 +33 @@
 
 typedef signed char __s8;
+typedef signed short __s16;
+typedef signed long __s32;
+typedef signed long long __s64;
 
 typedef unsigned char __u8;
 typedef unsigned short __u16;
 typedef unsigned long __u32;
-typedef long long __u64;
+typedef unsigned long long __u64;
 
 typedef __u32 __address;

arch/sparc64/Makefile.inc ¶

@@ -41 +41 @@
 CFLAGS += -mcpu=ultrasparc -m64
 LFLAGS += -no-check-sections -N
+
+DEFS += -D__64_BITS__
 
 ## Own configuration directives

arch/sparc64/include/elf.h ¶

@@ -27 +27 @@
  */
 
-#ifndef __ia64_ELF_H__
-#define __ia64_ELF_H__
-
-#include <elf64.h>
+#ifndef __sparc64_ELF_H__
+#define __sparc64_ELF_H__
 
 #define ELF_MACHINE             EM_SPARCV9
@@ -36 +34 @@
 #define ELF_CLASS               ELFCLASS64
 
-/*
- * Main ELF loader function
- */
-#define elf_load(header, as) elf64_load(header, as)
-
 #endif

contrib/conf/msim.conf ¶

@@ -8 +8 @@
 add rwm mainmem         0x00100000      16M     load "kernel/kernel.bin"
 add rom startmem        0x1fc00000      1k      load "kernel/load.bin" 
-add rwm init            0x20000000      1M      load "uspace/init/init"
+add rwm init            0x01000000      1M      load "uspace/init/init"
 
 add dprinter printer 0x10000000

contrib/conf/ski.conf ¶

@@ -1 +1 @@
 load HelenOS/boot/kernel.bin
-romload HelenOS/boot/init 0x400000
+romload HelenOS/uspace/init/init 0x400000

contrib/conf/spmips.conf ¶

@@ -23 +23 @@
               (0x180003ff,      tty0,         0,            7,          1),
               (0x1c000000,      hfs0,         0,            0,         16),
-              (0x20000000,      initmem0,     0,            0,  0x20000))
+              (0x01000000,      initmem0,     0,            0,  0x20000))
 }
 

generic/include/elf.h ¶

@@ -31 +31 @@
 
 #include <arch/elf.h>
-
+#include <arch/types.h>
+#include <mm/as.h>
+
+/**
+ * current ELF version
+ */
+#define EV_CURRENT      1
+
+/** 
+ * ELF types 
+ */
+#define ET_NONE         0       /* No type */
+#define ET_REL          1       /* Relocatable file */
+#define ET_EXEC         2       /* Executable */
+#define ET_DYN          3       /* Shared object */
+#define ET_CORE         4       /* Core */
+#define ET_LOPROC       0xff00  /* Processor specific */
+#define ET_HIPROC       0xffff  /* Processor specific */
+
+/** 
+ * ELF machine types
+ */
+#define EM_NO           0       /* No machine */
+#define EM_SPARC        2       /* SPARC */
+#define EM_386          3       /* i386 */
+#define EM_MIPS         8       /* MIPS RS3000 */
+#define EM_MIPS_RS3_LE  10      /* MIPS RS3000 LE */
+#define EM_PPC          20      /* PPC32 */
+#define EM_PPC64        21      /* PPC64 */
+#define EM_SPARCV9      43      /* SPARC64 */
+#define EM_IA_64        50      /* IA-64 */
+#define EM_X86_64       62      /* AMD64/EMT64 */
+
+/**
+ * ELF identification indexes
+ */
+#define EI_MAG0         0
+#define EI_MAG1         1
+#define EI_MAG2         2
+#define EI_MAG3         3
+#define EI_CLASS        4               /* File class */
+#define EI_DATA         5               /* Data encoding */
+#define EI_VERSION      6               /* File version */
+#define EI_OSABI        7
+#define EI_ABIVERSION   8
+#define EI_PAD          9               /* Start of padding bytes */
+#define EI_NIDENT       16              /* ELF identification table size */
+
+/**
+ * ELF magic number
+ */
+#define ELFMAG0         0x7f
+#define ELFMAG1         'E'
+#define ELFMAG2         'L'
+#define ELFMAG3         'F'
+
+/**
+ * ELF file classes
+ */
+#define ELFCLASSNONE    0
+#define ELFCLASS32      1
+#define ELFCLASS64      2
+
+/**
+ * ELF data encoding types
+ */
+#define ELFDATANONE     0
+#define ELFDATA2LSB     1               /* Least significant byte first (little endian) */
+#define ELFDATA2MSB     2               /* Most signigicant byte first (big endian) */
+
+/**
+ * ELF error return codes
+ */
+#define EE_OK                   0       /* No error */
+#define EE_INVALID              1       /* Invalid ELF image */
+#define EE_MEMORY               2       /* Cannot allocate address space */
+#define EE_INCOMPATIBLE         3       /* ELF image is not compatible with current architecture */
+#define EE_UNSUPPORTED          4       /* Non-supported ELF (e.g. dynamic ELFs) */
+#define EE_IRRECOVERABLE        5
+
+/**
+ * ELF section types
+ */
+#define SHT_NULL                0
+#define SHT_PROGBITS            1
+#define SHT_SYMTAB              2
+#define SHT_STRTAB              3
+#define SHT_RELA                4
+#define SHT_HASH                5
+#define SHT_DYNAMIC             6
+#define SHT_NOTE                7
+#define SHT_NOBITS              8
+#define SHT_REL                 9
+#define SHT_SHLIB               10
+#define SHT_DYNSYM              11
+#define SHT_LOOS                0x60000000
+#define SHT_HIOS                0x6fffffff
+#define SHT_LOPROC              0x70000000
+#define SHT_HIPROC              0x7fffffff
+#define SHT_LOUSER              0x80000000
+#define SHT_HIUSER              0xffffffff
+
+/**
+ * ELF section flags
+ */
+#define SHF_WRITE               0x1 
+#define SHF_ALLOC               0x2
+#define SHF_EXECINSTR           0x4
+#define SHF_MASKPROC            0xf0000000
+
+/**
+ * Symbol binding
+ */
+#define STB_LOCAL               0
+#define STB_GLOBAL              1
+#define STB_WEAK                2
+#define STB_LOPROC              13
+#define STB_HIPROC              15
+
+/**
+ * Symbol types
+ */
+#define STT_NOTYPE              0
+#define STT_OBJECT              1
+#define STT_FUNC                2
+#define STT_SECTION             3
+#define STT_FILE                4
+#define STT_LOPROC              13
+#define STT_HIPROC              15
+
+/**
+ * Program segment types
+ */
+#define PT_NULL                 0
+#define PT_LOAD                 1
+#define PT_DYNAMIC              2
+#define PT_INTERP               3
+#define PT_NOTE                 4
+#define PT_SHLIB                5
+#define PT_PHDR                 6
+#define PT_LOPROC               0x70000000
+#define PT_HIPROC               0x7fffffff
+
+/**
+ * Program segment attributes.
+ */
+#define PF_X    1
+#define PF_W    2
+#define PF_R    4
+
+/**
+ * ELF data types
+ *
+ * These types are found to be identical in both 32-bit and 64-bit
+ * ELF object file specifications. They are the only types used
+ * in ELF header.
+ */
+typedef __u64 elf_xword;
+typedef __s64 elf_sxword;
+typedef __u32 elf_word;
+typedef __s32 elf_sword;
+typedef __u16 elf_half;
+
+/**
+ * 32-bit ELF data types.
+ *
+ * These types are specific for 32-bit format.
+ */
+typedef __u32 elf32_addr;
+typedef __u32 elf32_off;
+
+/**
+ * 64-bit ELF data types.
+ *
+ * These types are specific for 64-bit format.
+ */
+typedef __u64 elf64_addr;
+typedef __u64 elf64_off;
+
+/** ELF header */
+struct elf32_header {
+        __u8 e_ident[EI_NIDENT];
+        elf_half e_type;
+        elf_half e_machine;
+        elf_word e_version;
+        elf32_addr e_entry;
+        elf32_off e_phoff;
+        elf32_off e_shoff;
+        elf_word e_flags;
+        elf_half e_ehsize;
+        elf_half e_phentsize;
+        elf_half e_phnum;
+        elf_half e_shentsize;
+        elf_half e_shnum;
+        elf_half e_shstrndx;
+};
+struct elf64_header {
+        __u8 e_ident[EI_NIDENT];
+        elf_half e_type;
+        elf_half e_machine;
+        elf_word e_version;
+        elf64_addr e_entry;
+        elf64_off e_phoff;
+        elf64_off e_shoff;
+        elf_word e_flags;
+        elf_half e_ehsize;
+        elf_half e_phentsize;
+        elf_half e_phnum;
+        elf_half e_shentsize;
+        elf_half e_shnum;
+        elf_half e_shstrndx;
+};
+
+/*
+ * ELF section header
+ */
+struct elf32_section_header {
+        elf_word sh_name;
+        elf_word sh_type;
+        elf_word sh_flags;
+        elf32_addr sh_addr;
+        elf32_off sh_offset;
+        elf_word sh_size;
+        elf_word sh_link;
+        elf_word sh_info;
+        elf_word sh_addralign;
+        elf_word sh_entsize;
+};
+struct elf64_section_header {
+        elf_word sh_name;
+        elf_word sh_type;
+        elf_xword sh_flags;
+        elf64_addr sh_addr;
+        elf64_off sh_offset;
+        elf_xword sh_size;
+        elf_word sh_link;
+        elf_word sh_info;
+        elf_xword sh_addralign;
+        elf_xword sh_entsize;
+};
+
+/*
+ * ELF symbol table entry
+ */
+struct elf32_symbol {
+        elf_word st_name;
+        elf32_addr st_value;
+        elf_word st_size;
+        __u8 st_info;
+        __u8 st_other;
+        elf_half st_shndx;
+};
+struct elf64_symbol {
+        elf_word st_name;
+        __u8 st_info;
+        __u8 st_other;
+        elf_half st_shndx;
+        elf64_addr st_value;
+        elf_xword st_size;
+};
+
+/*
+ * ELF program header entry
+ */
+struct elf32_ph_entry {
+        elf_word p_type;
+        elf32_off p_offset;
+        elf32_addr p_vaddr;
+        elf32_addr p_paddr;
+        elf_word p_filesz;
+        elf_word p_memsz;
+        elf_word p_flags;
+        elf_word p_align;
+};
+struct elf64_ph_entry {
+        elf_word p_type;
+        elf_word p_flags;
+        elf64_off p_offset;
+        elf64_addr p_vaddr;
+        elf64_addr p_paddr;
+        elf_xword p_filesz;
+        elf_xword p_memsz;
+        elf_xword p_align;
+};
+
+#ifdef __32_BITS__ 
+typedef struct elf32_header elf_header_t;
+typedef struct elf32_section_header elf_section_header_t;
+typedef struct elf32_symbol elf_symbol_t;
+typedef struct elf32_ph_entry elf_ph_entry_t;
 #endif
+#ifdef __64_BITS__
+typedef struct elf64_header elf_header_t;
+typedef struct elf64_section_header elf_section_header_t;
+typedef struct elf64_symbol elf_symbol_t;
+typedef struct elf64_ph_entry elf_ph_entry_t;
+#endif
+
+extern int elf_load(elf_header_t *header, as_t * as);
+extern char *elf_error(int rc);
+
+#endif

generic/include/userspace.h ¶

@@ -30 +30 @@
 #define __USERSPACE_H__
 
-extern void userspace(void) __attribute__ ((noreturn)); /**< Switch to user-space (CPU user priviledge level) */
+#include <arch/types.h>
+
+extern void userspace(__address entry) __attribute__ ((noreturn)); /**< Switch to user-space (CPU user priviledge level) */
 
 #endif

generic/src/main/kinit.c ¶

@@ -47 +47 @@
 #include <interrupt.h>
 #include <console/kconsole.h>
+#include <elf.h>
 
 #ifdef CONFIG_SMP
@@ -72 +73 @@
         as_t *as;
         as_area_t *a;
-        __address frame;
-        count_t frames;
-        int i;
+        int rc;
         task_t *u;
 
@@ -151 +150 @@
                 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");
+
+                rc = elf_load((elf_header_t *) config.init_addr, as);
+                if (rc != EE_OK) {
+                        printf("elf_load failed: %s\n", elf_error(rc));
+                } else {
+                        u = task_create(as);
+                        if (!u)
+                                panic("task_create\n");
+                        t = thread_create(uinit, (void *)((elf_header_t *) config.init_addr)->e_entry, u, THREAD_USER_STACK);
+                        if (!t)
+                                panic("thread_create\n");
                 
-                /*
-                 * Create the text as_area and initialize its mapping.
-                 */
-                
-                frame = config.init_addr;
-                if (IS_KA(frame))
-                        frame = KA2PA(frame);
+                        /*
+                         * Create the data as_area.
+                         */
+                        a = as_area_create(as, AS_AREA_STACK, 1, USTACK_ADDRESS);
+                        if (!a)
+                                panic("as_area_create: stack\n");
 
-                frames = SIZE2FRAMES(config.init_size);
-                
-                a = as_area_create(as, AS_AREA_TEXT, frames, UTEXT_ADDRESS);
-                if (!a)
-                        panic("as_area_create: text\n");
-
-                for (i = 0; i < frames; i++)
-                        as_set_mapping(as, UTEXT_ADDRESS + i * PAGE_SIZE, frame + i * FRAME_SIZE);
-
-                /*
-                 * 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);
+                        thread_ready(t);
+                }
         }
 

generic/src/main/uinit.c ¶

@@ -33 +33 @@
 #include <print.h>
 
-
 void uinit(void *arg)
 {
         printf("USER task, uinit thread: kernel mode\n");
-        userspace();
+        userspace((__address)(arg));
 }