Changeset c98e6ee in mainline for kernel/generic/include

Timestamp:

2008-07-08T16:05:45Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

f93f168

Parents:

b7f9087

Message:

Merge program-loader related stuff from dynload branch to trunk. (huge)

Location:

kernel/generic/include

Files:

• lib/elf.h (modified) (2 diffs)
• mm/as.h (modified) (2 diffs)
• proc/program.h (added)
• proc/task.h (modified) (1 diff)
• proc/thread.h (modified) (1 diff)
• synch/smc.h (added)
• syscall/syscall.h (modified) (1 diff)

kernel/generic/include/lib/elf.h

@@ -115 +115 @@
 #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
+#define EE_LOADER               5       /* The image is actually a program loader */
+#define EE_IRRECOVERABLE        6
 
 /**
@@ -339 +340 @@
 extern char *elf_error(unsigned int rc);
 
+/* Interpreter string used to recognize the program loader */
+#define ELF_INTERP_ZSTR "kernel"
+#define ELF_INTERP_ZLEN  sizeof(ELF_INTERP_ZSTR)
+
 #endif
 

kernel/generic/include/mm/as.h

@@ -270 +270 @@
 int as_area_share(as_t *src_as, uintptr_t src_base, size_t acc_size,
     as_t *dst_as, uintptr_t dst_base, int dst_flags_mask);
+extern int as_area_change_flags(as_t *as, int flags, uintptr_t address);
 
 extern int as_area_get_flags(as_area_t *area);
@@ -300 +301 @@
 extern mem_backend_t phys_backend;
 
-extern unsigned int elf_load(elf_header_t *header, as_t *as);
+/** 
+ * This flags is passed when running the loader, otherwise elf_load()
+ * would return with a EE_LOADER error code.
+ */
+#define ELD_F_NONE      0
+#define ELD_F_LOADER    1
+
+extern unsigned int elf_load(elf_header_t *header, as_t *as, int flags);
 
 /* Address space area related syscalls. */
 extern unative_t sys_as_area_create(uintptr_t address, size_t size, int flags);
 extern unative_t sys_as_area_resize(uintptr_t address, size_t size, int flags);
+extern unative_t sys_as_area_change_flags(uintptr_t address, int flags);
 extern unative_t sys_as_area_destroy(uintptr_t address);
 

kernel/generic/include/proc/task.h

@@ -133 +133 @@
 
 extern unative_t sys_task_get_id(task_id_t *uspace_task_id);
-extern unative_t sys_task_spawn(void *image, size_t size);
 
 #endif

kernel/generic/include/proc/thread.h

@@ -249 +249 @@
 extern bool thread_exists(thread_t *t);
 
-extern thread_t *thread_create_program(void *program_addr, char *name);
-
 /** Fpu context slab cache. */
 extern slab_cache_t *fpu_context_slab;

kernel/generic/include/syscall/syscall.h

@@ -45 +45 @@
         
         SYS_TASK_GET_ID,
-        SYS_TASK_SPAWN,
+        SYS_PROGRAM_SPAWN_LOADER,
         
         SYS_FUTEX_SLEEP,
         SYS_FUTEX_WAKEUP,
+        SYS_SMC_COHERENCE,
         
         SYS_AS_AREA_CREATE,
         SYS_AS_AREA_RESIZE,
+        SYS_AS_AREA_CHANGE_FLAGS,
         SYS_AS_AREA_DESTROY,