Changeset 3e828ea in mainline for kernel/generic/src/proc

Timestamp:

2019-09-23T12:49:29Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

Location:

kernel/generic/src/proc

Files:

• program.c (modified) (8 diffs)
• task.c (modified) (3 diffs)
• thread.c (modified) (3 diffs)

kernel/generic/src/proc/program.c

@@ -48 +48 @@
 #include <security/perm.h>
 #include <lib/elf_load.h>
-#include <errno.h>
+#include <str.h>
 #include <log.h>
 #include <syscall/copy.h>
@@ -69 +69 @@
  *
  */
-errno_t program_create(as_t *as, uintptr_t entry_addr, char *name, program_t *prg)
+errno_t program_create(as_t *as, uspace_addr_t entry_addr, char *name, program_t *prg)
 {
         uspace_arg_t *kernel_uarg = (uspace_arg_t *)
@@ -76 +76 @@
                 return ENOMEM;
 
-        prg->loader_status = EE_OK;
+        prg->loader_status = EOK;
         prg->task = task_create(as, name);
         if (!prg->task) {
@@ -86 +86 @@
          * Create the stack address space area.
          */
-        uintptr_t virt = (uintptr_t) -1;
+        uintptr_t virt = (uintptr_t) AS_AREA_ANY;
         uintptr_t bound = USER_ADDRESS_SPACE_END - (STACK_SIZE_USER - 1);
 
@@ -103 +103 @@
         }
 
-        kernel_uarg->uspace_entry = (void *) entry_addr;
-        kernel_uarg->uspace_stack = (void *) virt;
+        kernel_uarg->uspace_entry = entry_addr;
+        kernel_uarg->uspace_stack = virt;
         kernel_uarg->uspace_stack_size = STACK_SIZE_USER;
-        kernel_uarg->uspace_thread_function = NULL;
-        kernel_uarg->uspace_thread_arg = NULL;
-        kernel_uarg->uspace_uarg = NULL;
+        kernel_uarg->uspace_thread_function = USPACE_NULL;
+        kernel_uarg->uspace_thread_arg = USPACE_NULL;
+        kernel_uarg->uspace_uarg = USPACE_NULL;
 
         /*
@@ -149 +149 @@
 
         prg->loader_status = elf_load((elf_header_t *) image_addr, as);
-        if (prg->loader_status != EE_OK) {
+        if (prg->loader_status != EOK) {
                 as_release(as);
                 prg->task = NULL;
@@ -183 +183 @@
 
         prg->loader_status = elf_load((elf_header_t *) program_loader, as);
-        if (prg->loader_status != EE_OK) {
+        if (prg->loader_status != EOK) {
                 as_release(as);
                 log(LF_OTHER, LVL_ERROR, "Cannot spawn loader (%s)",
-                    elf_error(prg->loader_status));
+                    str_error(prg->loader_status));
                 return ENOENT;
         }
@@ -218 +218 @@
  *
  */
-sys_errno_t sys_program_spawn_loader(char *uspace_name, size_t name_len)
+sys_errno_t sys_program_spawn_loader(uspace_ptr_char uspace_name, size_t name_len)
 {
         /* Cap length of name and copy it from userspace. */

kernel/generic/src/proc/task.c

@@ -323 +323 @@
  *
  */
-sys_errno_t sys_task_get_id(sysarg64_t *uspace_taskid)
+sys_errno_t sys_task_get_id(uspace_ptr_sysarg64_t uspace_taskid)
 {
         /*
@@ -363 +363 @@
  *
  */
-sys_errno_t sys_task_set_name(const char *uspace_name, size_t name_len)
+sys_errno_t sys_task_set_name(const uspace_ptr_char uspace_name, size_t name_len)
 {
         char namebuf[TASK_NAME_BUFLEN];
@@ -404 +404 @@
  *
  */
-sys_errno_t sys_task_kill(task_id_t *uspace_taskid)
+sys_errno_t sys_task_kill(uspace_ptr_task_id_t uspace_taskid)
 {
         task_id_t taskid;

kernel/generic/src/proc/thread.c

@@ -998 +998 @@
  *
  */
-sys_errno_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name,
-    size_t name_len, thread_id_t *uspace_thread_id)
+sys_errno_t sys_thread_create(uspace_ptr_uspace_arg_t uspace_uarg, uspace_ptr_char uspace_name,
+    size_t name_len, uspace_ptr_thread_id_t uspace_thread_id)
 {
         if (name_len > THREAD_NAME_BUFLEN - 1)
@@ -1029 +1029 @@
             THREAD_FLAG_USPACE | THREAD_FLAG_NOATTACH, namebuf);
         if (thread) {
-                if (uspace_thread_id != NULL) {
+                if (uspace_thread_id) {
                         rc = copy_to_uspace(uspace_thread_id, &thread->tid,
                             sizeof(thread->tid));
@@ -1088 +1088 @@
  *
  */
-sys_errno_t sys_thread_get_id(thread_id_t *uspace_thread_id)
+sys_errno_t sys_thread_get_id(uspace_ptr_thread_id_t uspace_thread_id)
 {
         /*