 @@ -1,14 +1,14 @@
-/*	$NetBSD: callcontext.c,v 1.26 2011/11/02 16:43:04 yamt Exp $	*/
+/*	$NetBSD: callcontext.c,v 1.27 2011/12/06 21:15:39 skrll Exp $	*/
 /*
  * Copyright (c) 2006, 2007, 2008 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by the
  * Research Foundation of Helsinki University of Technology
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -20,27 +20,27 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: callcontext.c,v 1.26 2011/11/02 16:43:04 yamt Exp $");
+__RCSID("$NetBSD: callcontext.c,v 1.27 2011/12/06 21:15:39 skrll Exp $");
 #endif /* !lint */
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <assert.h>
 #include <errno.h>
 #include <puffs.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ucontext.h>
 #include <unistd.h>
 @@ -178,40 +178,44 @@ puffs_cc_getcaller(struct puffs_cc *pcc,
 	if (lid)
 		*lid = pcc->pcc_lid;
 	return 0;
+}
 static struct puffs_cc fakecc;
 static struct puffs_cc *
 slowccalloc(struct puffs_usermount *pu)
+{
 	struct puffs_cc *volatile pcc;
 	void *sp;
 	size_t stacksize = 1<<pu->pu_cc_stackshift;
-	long psize = sysconf(_SC_PAGESIZE);
+	const long psize = sysconf(_SC_PAGESIZE);
 	if (puffs_fakecc)
 		return &fakecc;
 	sp = mmap(NULL, stacksize, PROT_READ|PROT_WRITE,
 	    MAP_ANON|MAP_PRIVATE|MAP_ALIGNED(pu->pu_cc_stackshift), -1, 0);
 	if (sp == MAP_FAILED)
 		return NULL;
 	pcc = sp;
 	memset(pcc, 0, sizeof(struct puffs_cc));
 #ifndef __MACHINE_STACK_GROWS_UP
 	mprotect((uint8_t *)sp + psize, (size_t)psize, PROT_NONE);
 #else
 	mprotect((uint8_t *)sp + stacksize - psize, (size_t)psize, PROT_NONE);
 #endif
 	/* initialize both ucontext's */
 	if (getcontext(&pcc->pcc_uc) == -1) {
 		munmap(pcc, stacksize);
 		return NULL;
+	}
 	if (getcontext(&pcc->pcc_uc_ret) == -1) {
 		munmap(pcc, stacksize);
 		return NULL;
+	}
 	return pcc;
+}
 @@ -235,37 +239,39 @@ puffs__cc_create(struct puffs_usermount
 		pcc = LIST_FIRST(&pu->pu_ccmagazin);
 		assert(pcc != NULL);
 		LIST_REMOVE(pcc, pcc_rope);
 		pu->pu_cc_nstored--;
 		DPRINTF(("puffs__cc_create: magazin pcc %p\n", pcc));
+	}
 	assert(pcc->pcc_pu == pu);
 	if (puffs_fakecc) {
 		pcc->pcc_func = func;
 		pcc->pcc_farg = pcc;
 	} else {
 		const long psize = sysconf(_SC_PAGESIZE);
 		/* link context */
 		pcc->pcc_uc.uc_link = &pcc->pcc_uc_ret;
 		/* setup stack
+		 *
 		 * XXX: I guess this should theoretically be preserved by
 		 * swapcontext().  However, it gets lost.  So reinit it.
 		 */
 		st = &pcc->pcc_uc.uc_stack;
-		st->ss_sp = pcc;
+		st->ss_sp = ((uint8_t *)(void *)pcc) + psize;
-		st->ss_size = stacksize;
+		st->ss_size = stacksize - psize;
 		st->ss_flags = 0;
 		/*
 		 * Give us an initial context to jump to.
+		 *
 		 * Our manual page says that portable code shouldn't
 		 * rely on being able to pass pointers through makecontext().
 		 * kjk says that NetBSD code doesn't need to worry about this.
 		 * uwe says it would be like putting a "keep away from
 		 * children" sign on a box of toys.
 		 */
 		makecontext(&pcc->pcc_uc, (void *)func, 1, (uintptr_t)pcc);
+	}