Changeset 850235d in mainline for kernel/generic/src/proc

Timestamp:

2013-03-10T14:56:21Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

05bab88

Parents:

ea906c29 (diff), 2277e03 (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.

Message:

Merge mainline changes

Location:

kernel/generic/src/proc

Files:

• program.c (modified) (2 diffs)
• scheduler.c (modified) (2 diffs)
• task.c (modified) (2 diffs)

kernel/generic/src/proc/program.c

@@ -79 +79 @@
          * Create the stack address space area.
          */
-        uintptr_t virt = USTACK_ADDRESS;
+        uintptr_t virt = (uintptr_t) -1;
+        uintptr_t bound = USER_ADDRESS_SPACE_END - (STACK_SIZE_USER - 1);
+
+        /* Adjust bound to create space for the desired guard page. */
+        bound -= PAGE_SIZE;
+
         as_area_t *area = as_area_create(as,
-            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE,
-            STACK_SIZE, AS_AREA_ATTR_NONE, &anon_backend, NULL, &virt, 0);
+            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE | AS_AREA_GUARD |
+            AS_AREA_LATE_RESERVE, STACK_SIZE_USER, AS_AREA_ATTR_NONE,
+            &anon_backend, NULL, &virt, bound);
         if (!area) {
                 task_destroy(prg->task);
@@ -93 +99 @@
         kernel_uarg->uspace_entry = (void *) entry_addr;
         kernel_uarg->uspace_stack = (void *) virt;
-        kernel_uarg->uspace_stack_size = STACK_SIZE;
+        kernel_uarg->uspace_stack_size = STACK_SIZE_USER;
         kernel_uarg->uspace_thread_function = NULL;
         kernel_uarg->uspace_thread_arg = NULL;

kernel/generic/src/proc/scheduler.c

@@ -92 +92 @@
         else
                 fpu_disable();
-#else
+#elif defined CONFIG_FPU
         fpu_enable();
         if (THREAD->fpu_context_exists)
@@ -327 +327 @@
                 THREAD->kcycles += get_cycle() - THREAD->last_cycle;
                 
-#ifndef CONFIG_FPU_LAZY
+#if (defined CONFIG_FPU) && (!defined CONFIG_FPU_LAZY)
                 fpu_context_save(THREAD->saved_fpu_context);
 #endif

kernel/generic/src/proc/task.c

@@ -125 +125 @@
 {
         size_t tasks_left;
+
+        if (ipc_phone_0) {
+                task_t *task_0 = ipc_phone_0->task;
+                ipc_phone_0 = NULL;
+                /*
+                 * The first task is held by kinit(), we need to release it or
+                 * it will never finish cleanup.
+                 */
+                task_release(task_0);
+        }
         
         /* Repeat until there are any tasks except TASK */
@@ -196 +206 @@
         task->ucycles = 0;
         task->kcycles = 0;
-        
+
         task->ipc_info.call_sent = 0;
         task->ipc_info.call_received = 0;