Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/lib/libpuffs/callcontext.c,v
rcsdiff: /ftp/cvs/cvsroot/src/lib/libpuffs/callcontext.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- src/lib/libpuffs/callcontext.c	2008/01/28 18:51:03	1.21
+++ src/lib/libpuffs/callcontext.c	2008/08/11 15:59:01	1.22
@@ -1,4 +1,4 @@
-/*	$NetBSD: callcontext.c,v 1.21 2008/01/28 18:51:03 pooka Exp $	*/
+/*	$NetBSD: callcontext.c,v 1.22 2008/08/11 15:59:01 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006, 2007, 2008 Antti Kantee.  All Rights Reserved.
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: callcontext.c,v 1.21 2008/01/28 18:51:03 pooka Exp $");
+__RCSID("$NetBSD: callcontext.c,v 1.22 2008/08/11 15:59:01 pooka Exp $");
 #endif /* !lint */
 
 #include <sys/types.h>
@@ -47,6 +47,12 @@ __RCSID("$NetBSD: callcontext.c,v 1.21 2
 
 #include "puffs_priv.h"
 
+#if 0
+#define DPRINTF(x) printf x
+#else
+#define DPRINTF(x)
+#endif
+
 /*
  * Set the following to 1 to not handle each request on a separate
  * stack.  This is highly volatile kludge, therefore no external
@@ -75,14 +81,18 @@ puffs_cc_yield(struct puffs_cc *pcc)
 	pcc->pcc_flags &= ~PCC_BORROWED;
 
 	/* romanes eunt domus */
+	DPRINTF(("puffs_cc_yield: ")); 
 	if ((pcc->pcc_flags & PCC_MLCONT) == 0) {
+		DPRINTF(("no mlcont, pcc %p\n", pcc));
 		swapcontext(&pcc->pcc_uc, &pcc->pcc_uc_ret);
 	} else {
+		DPRINTF(("mlcont, pcc %p\n", pcc));
 		pcc->pcc_flags &= ~PCC_MLCONT;
 		rv = puffs__cc_create(pcc->pcc_pu, puffs__theloop, &jumpcc);
 		if (rv)
 			abort(); /* p-p-p-pa-pa-panic (XXX: fixme) */
 		swapcontext(&pcc->pcc_uc, &jumpcc->pcc_uc);
+		DPRINTF(("puffs_cc_yield: post swap pcc %p\n", pcc));
 	}
 }
 
@@ -97,6 +107,7 @@ puffs__cc_cont(struct puffs_cc *pcc)
 	struct puffs_cc *mycc;
 
 	mycc = puffs_cc_getcc(pcc->pcc_pu);
+	DPRINTF(("puffs__cc_cont: pcc %p, mycc %p\n", pcc, mycc));
 
 	/*
 	 * XXX: race between setcontenxt() and recycle if
@@ -112,10 +123,12 @@ puffs_cc_continue(struct puffs_cc *pcc)
 {
 
 	/* ramble on */
-	if (puffs_fakecc)
+	DPRINTF(("puffs_cc_continue: pcc %p\n", pcc));
+	if (puffs_fakecc) {
 		pcc->pcc_func(pcc->pcc_farg);
-	else 
+	} else {
 		swapcontext(&pcc->pcc_uc_ret, &pcc->pcc_uc);
+	}
 }
 
 /*
@@ -247,6 +260,7 @@ puffs__cc_create(struct puffs_usermount 
 		makecontext(&pcc->pcc_uc, (void *)func, 1, (uintptr_t)pcc);
 	}
 
+	DPRINTF(("puffs__cc_create: created pcc %p with fun %p\n", pcc, func));
 	*pccp = pcc;
 	return 0;
 }
@@ -291,3 +305,19 @@ puffs_cc_getcc(struct puffs_usermount *p
 	bottom = ((uintptr_t)&bottom) & ~(stacksize-1);
 	return (struct puffs_cc *)bottom;
 }
+
+int
+puffs__cc_savemain(struct puffs_usermount *pu)
+{
+
+	PU_CLRSFLAG(pu, PU_MAINRESTORE);
+	return getcontext(&pu->pu_mainctx);
+}
+
+int
+puffs__cc_restoremain(struct puffs_usermount *pu)
+{
+
+	PU_SETSFLAG(pu, PU_MAINRESTORE);
+	return setcontext(&pu->pu_mainctx);
+}