3 files changed, 64 insertions, 6 deletions
diff --git a/common/tcb.c b/common/tcb.c
index 417ca45..5f0e97b 100644
--- a/common/tcb.c
+++ b/common/tcb.c
@@ -172,14 +172,14 @@ struct tcb *create_thread(struct tcb *p)
 /**
  * Copy process.
  *
- * @param p Parent process.
  * @param n New process.
+ * @param p Parent process.
  * @return \ref OK.
  */
-static stat_t __copy_proc(struct tcb *p, struct tcb *n)
+static stat_t __copy_proc(struct tcb *n, struct tcb *p)
 {
-	/** \todo Copy memory regions as well as copy */
-	return OK;
+	/* execution continuation? */
+	return clone_mem_regions(n, p);
 }
 
 struct tcb *create_proc(struct tcb *p)
diff --git a/common/uapi/proc.c b/common/uapi/proc.c
index 0039195..5dbd90c 100644
--- a/common/uapi/proc.c
+++ b/common/uapi/proc.c
@@ -63,9 +63,9 @@ SYSCALL_DEFINE0(fork)(){
 		return SYS_RET1(ERR_OOMEM);
 
 	/* prepare args for when we eventually swap to the new proc */
-	set_args(t, SYS_RET2(OK, t->pid));
+	set_args(t, SYS_RET2(OK, 0));
 
-	return SYS_RET2(OK, 0);
+	return SYS_RET2(OK, t->pid);
 }
 
 /**
diff --git a/common/vmem.c b/common/vmem.c
index 73bc672..42b4adf 100644
--- a/common/vmem.c
+++ b/common/vmem.c
@@ -8,6 +8,7 @@
 
 #include <apos/mem_regions.h>
 #include <apos/assert.h>
+#include <apos/string.h>
 #include <apos/debug.h>
 #include <apos/bits.h>
 #include <apos/vmem.h>
@@ -18,6 +19,20 @@ stat_t init_uvmem(struct tcb *t, vm_t base, vm_t top)
 	return init_region(&t->sp_r, base, top);
 }
 
+static stat_t __clone_mapped_region(struct tcb *d, struct tcb *s, struct mem_region *m)
+{
+	size_t size = 0;
+	vm_t va = alloc_fixed_region(&d->sp_r, m->start, m->end - m->start,
+			&size, m->flags);
+
+	catastrophic_assert(va == m->start);
+
+	if (copy_allocd_region(d->proc.vmem, va, size, m->flags, s))
+		return ERR_MISC;
+
+	return OK;
+}
+
 /**
  * Convenience function for freeing mapped regions.
  *
@@ -70,6 +85,21 @@ stat_t destroy_uvmem(struct tcb *t)
 	return destroy_region(&t->sp_r);
 }
 
+stat_t clone_mem_regions(struct tcb *d, struct tcb *s)
+{
+	/** @todo implement some way to only iterate used regions, this loops
+	 * through all regions which is likely a slight bit slower. */
+	struct mem_region *m = find_first_region(&s->sp_r);
+	while (m) {
+		if (is_region_used(m))
+			__clone_mapped_region(d, s, m);
+
+		m = m->next;
+	}
+
+	return OK;
+}
+
 vm_t alloc_uvmem(struct tcb *t, size_t size, vmflags_t flags)
 {
 	/* t exists and is the process tcb of the current process */
@@ -189,6 +219,34 @@ stat_t alloc_shared_wrapper(struct vmem *b, pm_t *offset, vm_t vaddr,
 	return (ret == INFO_SEFF) ? OK : ret;
 }
 
+stat_t copy_allocd_wrapper(struct vmem *b, pm_t *offset, vm_t vaddr,
+		vmflags_t flags, enum mm_order order, void *data)
+{
+	struct vmem *s = (struct vmem *)data;
+
+	pm_t paddr = 0;
+	enum mm_order v_order = 0;
+	stat_vpage(s, vaddr, &paddr, &v_order, 0);
+	/** @todo what if we could combine multiple pages into one in the new
+	 * process? */
+	if (order > v_order)
+		return INFO_TRGN;
+
+	pm_t new_page = alloc_page(order);
+	if (!new_page)
+		return INFO_TRGN;
+
+	map_vpage(b, new_page, vaddr, flags, order);
+	memcpy((void *)new_page, (void *)(paddr + *offset), order_size(order));
+
+	if (v_order > order)
+		*offset += order_size(order);
+	else
+		*offset = 0;
+
+	return OK;
+}
+
 stat_t free_uvmem_wrapper(struct vmem *b, pm_t *offset, vm_t vaddr,
                           vmflags_t flags, enum mm_order order, void *data)
 {