[movitz-cvs] CVS update: movitz/losp/muerte/primitive-functions.lisp

[Frode Vatvedt Fjeld]

Update of /project/movitz/cvsroot/movitz/losp/muerte
In directory common-lisp.net:/tmp/cvs-serv3432

Modified Files:
	primitive-functions.lisp 
Log Message:
Changed the protocol (wrt. stack discipline) for dynamic control
transfer slightly, so that restart-atomically-continuation
(i.e. continue after an interrupt occurred inside an atomical
sequence) fits into it all.

Date: Thu Feb  3 10:19:03 2005
Author: ffjeld

Index: movitz/losp/muerte/primitive-functions.lisp
diff -u movitz/losp/muerte/primitive-functions.lisp:1.62 movitz/losp/muerte/primitive-functions.lisp:1.63
--- movitz/losp/muerte/primitive-functions.lisp:1.62	Tue Feb  1 17:20:08 2005
+++ movitz/losp/muerte/primitive-functions.lisp	Thu Feb  3 10:19:02 2005
@@ -10,7 +10,7 @@
 ;;;; Author:        Frode Vatvedt Fjeld <frodef at acm.org>
 ;;;; Created at:    Tue Oct  2 21:02:18 2001
 ;;;;                
-;;;; $Id: primitive-functions.lisp,v 1.62 2005/02/01 16:20:08 ffjeld Exp $
+;;;; $Id: primitive-functions.lisp,v 1.63 2005/02/03 09:19:02 ffjeld Exp $
 ;;;;                
 ;;;;------------------------------------------------------------------
 
@@ -685,7 +685,7 @@
   (with-inline-assembly (:returns :non-local-exit)
     (:movl :edi :esi)			; before bumping ESP, remove reference to funobj..
 					; ..in case it's stack-allocated.
-    (:locally (:movl :edx (:edi (:edi-offset dynamic-env)))) ; exit to next-env
+    (:locally (:movl :edx (:edi (:edi-offset scratch1)))) ; non-local stack-mode target entry.
     (:movl :edi :ebp)			; enter non-local jump stack mode.
     (:movl :edx :esp)			; 
     (:movl (:esp) :edx)			; target stack-frame EBP