Changeset 1f7753a in mainline for kernel/generic/src/proc/program.c

Timestamp:

2012-11-18T22:10:15Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0ab362c, c739102

Parents:

a7f7ed12 (diff), 34ae0a5 (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 from lp:~jakub/helenos/mm.

File:

• kernel/generic/src/proc/program.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;