January 2005 - movitz-cvs@common-lisp.net

[movitz-cvs] CVS update: movitz/losp/muerte/los-closette.lisp
by ffjeld＠common-lisp.net 04 Jan '05

04 Jan '05

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv12597 Modified Files: los-closette.lisp Log Message: It's probably a good idea to signal an error when trying to print an illegal-value. Date: Tue Jan 4 21:23:17 2005 Author: ffjeld Index: movitz/losp/muerte/los-closette.lisp diff -u movitz/losp/muerte/los-closette.lisp:1.24 movitz/losp/muerte/los-closette.lisp:1.25 --- movitz/losp/muerte/los-closette.lisp:1.24 Mon Dec 20 14:42:51 2004 +++ movitz/losp/muerte/los-closette.lisp Tue Jan 4 21:23:16 2005 @@ -1,6 +1,6 @@ ;;;;------------------------------------------------------------------ ;;;; -;;;; Copyright (C) 2001-2004, +;;;; Copyright (C) 2001-2005, ;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Tue Jul 23 14:29:10 2002 ;;;; -;;;; $Id: los-closette.lisp,v 1.24 2004/12/20 13:42:51 ffjeld Exp $ +;;;; $Id: los-closette.lisp,v 1.25 2005/01/04 20:23:16 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -1723,7 +1723,8 @@ x) (defmethod print-object ((x illegal-object) stream) - (print-unreadable-object (x stream :type t :identity t)) + (error "Won't print illegal-object ~Z." x) + ;; (print-unreadable-object (x stream :type t :identity t)) x) ;;;

1 0

[movitz-cvs] CVS update: movitz/special-operators-cl.lisp
by ffjeld＠common-lisp.net 04 Jan '05

04 Jan '05

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv12579 Modified Files: special-operators-cl.lisp Log Message: Have tagbody set up a dynamic control transfer target properly. Date: Tue Jan 4 21:22:02 2005 Author: ffjeld Index: movitz/special-operators-cl.lisp diff -u movitz/special-operators-cl.lisp:1.41 movitz/special-operators-cl.lisp:1.42 --- movitz/special-operators-cl.lisp:1.41 Tue Jan 4 17:54:02 2005 +++ movitz/special-operators-cl.lisp Tue Jan 4 21:22:00 2005 @@ -9,7 +9,7 @@ ;;;; Created at: Fri Nov 24 16:31:11 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: special-operators-cl.lisp,v 1.41 2005/01/04 16:54:02 ffjeld Exp $ +;;;; $Id: special-operators-cl.lisp,v 1.42 2005/01/04 20:22:00 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -722,7 +722,7 @@ ;; catcher (:locally (:pushl (:edi (:edi-offset dynamic-env)))) (:pushl ',label-set-name) - (:pushl :eax) + (:locally (:pushl (:edi (:edi-offset unbound-function)))) (:pushl :ebp) (:locally (:movl :esp (:edi (:edi-offset dynamic-env))))) maybe-store-esp-code

1 0

[movitz-cvs] CVS update: movitz/compiler.lisp
by ffjeld＠common-lisp.net 04 Jan '05

04 Jan '05

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv12548 Modified Files: compiler.lisp Log Message: Fixed bug in make-compiled-lexical-control-transfer that would cause ESP not to be reset correctly in some situations. Date: Tue Jan 4 21:21:11 2005 Author: ffjeld Index: movitz/compiler.lisp diff -u movitz/compiler.lisp:1.126 movitz/compiler.lisp:1.127 --- movitz/compiler.lisp:1.126 Tue Jan 4 17:53:46 2005 +++ movitz/compiler.lisp Tue Jan 4 21:21:11 2005 @@ -8,7 +8,7 @@ ;;;; Created at: Wed Oct 25 12:30:49 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: compiler.lisp,v 1.126 2005/01/04 16:53:46 ffjeld Exp $ +;;;; $Id: compiler.lisp,v 1.127 2005/01/04 20:21:11 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -5950,7 +5950,7 @@ return-mode) `((:jmp ',to-label))))) ((plusp num-dynamic-slots) - ;; (warn "num-dynamic-slots: ~S" num-dynamic-slots) + ;; (warn "num-dynamic-slots: ~S, distance: ~D" num-dynamic-slots stack-distance) (compiler-values () :returns :non-local-exit :code (append return-code @@ -5966,10 +5966,8 @@ (:locally (:call (:edi (:edi-offset dynamic-unwind-next)))) (:locally (:movl :eax (:edi (:edi-offset dynamic-env)))) (:jc '(:sub-program () (:int 63)))))) - (make-compiled-stack-restore stack-distance - (exit-result-mode to-env) - return-mode) - `((:jmp ',to-label))))) + `((:leal (:esp ,(* 4 stack-distance)) :esp) + (:jmp ',to-label))))) (t (error "unknown!"))))) (defun make-compiled-push-current-values ()

1 0

[movitz-cvs] CVS update: movitz/procfs-image.lisp
by ffjeld＠common-lisp.net 04 Jan '05

04 Jan '05

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv1885 Modified Files: procfs-image.lisp Log Message: We have bignums, too. Date: Tue Jan 4 17:56:45 2005 Author: ffjeld Index: movitz/procfs-image.lisp diff -u movitz/procfs-image.lisp:1.21 movitz/procfs-image.lisp:1.22 --- movitz/procfs-image.lisp:1.21 Tue Nov 23 17:11:31 2004 +++ movitz/procfs-image.lisp Tue Jan 4 17:56:44 2005 @@ -1,6 +1,6 @@ ;;;;------------------------------------------------------------------ ;;;; -;;;; Copyright (C) 2001-2004, +;;;; Copyright (C) 2001-2005, ;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Fri Aug 24 11:39:37 2001 ;;;; -;;;; $Id: procfs-image.lisp,v 1.21 2004/11/23 16:11:31 ffjeld Exp $ +;;;; $Id: procfs-image.lisp,v 1.22 2005/01/04 16:56:44 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -124,6 +124,8 @@ (movitz-vector-symbolic-data expr))) (movitz-fixnum (movitz-fixnum-value expr)) + (movitz-bignum + (movitz-bignum-value expr)) (movitz-basic-vector (map 'vector #'movitz-print (movitz-vector-symbolic-data expr))) (movitz-cons

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/more-macros.lisp
by ffjeld＠common-lisp.net 04 Jan '05

04 Jan '05

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv1862 Modified Files: more-macros.lisp Log Message: Small fix for the %run-time-context-slot compiler-macro and :code-vector-word slots. Date: Tue Jan 4 17:56:19 2005 Author: ffjeld Index: movitz/losp/muerte/more-macros.lisp diff -u movitz/losp/muerte/more-macros.lisp:1.23 movitz/losp/muerte/more-macros.lisp:1.24 --- movitz/losp/muerte/more-macros.lisp:1.23 Mon Jan 3 12:56:14 2005 +++ movitz/losp/muerte/more-macros.lisp Tue Jan 4 17:56:19 2005 @@ -1,6 +1,6 @@ ;;;;------------------------------------------------------------------ ;;;; -;;;; Copyright (C) 2001-2004, +;;;; Copyright (C) 2001-2005, ;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Fri Jun 7 15:05:57 2002 ;;;; -;;;; $Id: more-macros.lisp,v 1.23 2005/01/03 11:56:14 ffjeld Exp $ +;;;; $Id: more-macros.lisp,v 1.24 2005/01/04 16:56:19 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -342,8 +342,8 @@ (:locally (:movl (:edi (:edi-offset ,slot-name)) :eax)))) (movitz::code-vector-word `(with-inline-assembly (:returns :eax) - (:locally (:movl (:edi (:edi-offset ,slot-name)) :eax)) - (:subl ,movitz::+code-vector-word-offset+ :eax))) + (:movl ,(ldb (byte 32 0) (- movitz::+code-vector-word-offset+)) :eax) + (:locally (:addl (:edi (:edi-offset ,slot-name)) :eax)))) (movitz::lu32 `(with-inline-assembly (:returns :untagged-fixnum-ecx) (:locally (:movl (:edi (:edi-offset ,slot-name)) :ecx))))))))

1 0

[movitz-cvs] CVS update: movitz/losp/x86-pc/debugger.lisp
by ffjeld＠common-lisp.net 04 Jan '05

04 Jan '05

Update of /project/movitz/cvsroot/movitz/losp/x86-pc In directory common-lisp.net:/tmp/cvs-serv1840 Modified Files: debugger.lisp Log Message: Fixing dynamic control transfers, primarily to handle the stack-allocated funobjs, but there seems to be a number of (other) bugs here too. It's not quite working yet, though. Date: Tue Jan 4 17:54:35 2005 Author: ffjeld Index: movitz/losp/x86-pc/debugger.lisp diff -u movitz/losp/x86-pc/debugger.lisp:1.27 movitz/losp/x86-pc/debugger.lisp:1.28 --- movitz/losp/x86-pc/debugger.lisp:1.27 Thu Oct 21 22:27:00 2004 +++ movitz/losp/x86-pc/debugger.lisp Tue Jan 4 17:54:34 2005 @@ -1,6 +1,6 @@ ;;;;------------------------------------------------------------------ ;;;; -;;;; Copyright (C) 2001-2004, +;;;; Copyright (C) 2001-2005, ;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Fri Nov 22 10:09:18 2002 ;;;; -;;;; $Id: debugger.lisp,v 1.27 2004/10/21 20:27:00 ffjeld Exp $ +;;;; $Id: debugger.lisp,v 1.28 2005/01/04 16:54:34 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -470,6 +470,8 @@ for frame = initial-stack-frame-index then (or next-frame (let ((uplink (stack-frame-uplink stack frame))) + (assert (typep uplink 'fixnum) () + "Weird uplink ~S for frame ~S." uplink frame) (assert (> uplink frame) () "Backtracing uplink ~S from frame index ~S." uplink frame) uplink))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/scavenge.lisp
by ffjeld＠common-lisp.net 04 Jan '05

04 Jan '05

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv1825 Modified Files: scavenge.lisp Log Message: Fixing dynamic control transfers, primarily to handle the stack-allocated funobjs, but there seems to be a number of (other) bugs here too. It's not quite working yet, though. Date: Tue Jan 4 17:54:28 2005 Author: ffjeld Index: movitz/losp/muerte/scavenge.lisp diff -u movitz/losp/muerte/scavenge.lisp:1.38 movitz/losp/muerte/scavenge.lisp:1.39 --- movitz/losp/muerte/scavenge.lisp:1.38 Mon Jan 3 12:53:47 2005 +++ movitz/losp/muerte/scavenge.lisp Tue Jan 4 17:54:27 2005 @@ -1,6 +1,6 @@ ;;;;------------------------------------------------------------------ ;;;; -;;;; Copyright (C) 2003-2004, +;;;; Copyright (C) 2003-2005, ;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Mon Mar 29 14:54:08 2004 ;;;; -;;;; $Id: scavenge.lisp,v 1.38 2005/01/03 11:53:47 ffjeld Exp $ +;;;; $Id: scavenge.lisp,v 1.39 2005/01/04 16:54:27 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -204,10 +204,11 @@ (+ dit-frame (dit-frame-index :ecx))))) ;; 2. Pop to (dit-)frame's CASF (setf nether-frame dit-frame - frame (dit-frame-casf stack frame)) - (let ((casf-funobj (funcall function (stack-frame-funobj stack frame) frame)) + frame casf-frame #+ignore (dit-frame-casf stack frame)) + (let ((eip-location (dit-frame-ref stack dit-frame :eip :location)) + (interrupted-esp (dit-frame-esp stack dit-frame)) (interrupted-ebp (dit-frame-ref stack dit-frame :ebp)) - (interrupted-esp (dit-frame-esp stack dit-frame))) + (casf-funobj (funcall function (stack-frame-funobj stack frame) frame))) (cond #+ignore ((eq nil casf-funobj) @@ -218,23 +219,21 @@ (let ((casf-code-vector (scavenge-funobj-code-vector casf-funobj))) ;; 3. Scavenge the interrupted frame, according to one of i. ii. or iii. (cond - ((< interrupted-ebp interrupted-esp) + ((eq nil interrupted-ebp) (cond - ((location-in-object-p casf-code-vector - (dit-frame-ref stack dit-frame :eip :location)) - (warn "DIT at throw situation, in target EIP=~S" + ((location-in-object-p casf-code-vector eip-location) + (warn "DIT at throw situation, in target ~S at ~S" + casf-funobj (dit-frame-ref stack dit-frame :eip :unsigned-byte32)) (map-region function interrupted-esp frame)) - ((location-in-object-p (scavenge-funobj-code-vector (dit-frame-ref stack - dit-frame - :scratch1)) - (dit-frame-ref stack dit-frame :eip :location)) - (warn "DIT at throw situation, in thrower EIP=~S" - (dit-frame-ref stack dit-frame :eip :unsigned-byte32)) - (map-region function interrupted-esp frame)) - (t (error "DIT with EBP<ESP, EBP=~S, ESP=~S" - interrupted-ebp - interrupted-esp)))) + ((location-in-object-p (%run-time-context-slot 'dynamic-jump-next) + eip-location) + (warn "DIT at throw situation, in dynamic-jump-next.") + (let ((dynamic-env (dit-frame-ref stack dit-frame :dynamic-env))) + (assert (< dynamic-env frame)) + (map-region function dynamic-env frame))) + (t (error "Unknown throw situation with EBP=~S, ESP=~S" + interrupted-ebp interrupted-esp)))) ((location-in-object-p casf-code-vector (dit-frame-ref stack dit-frame :eip :location)) (cond @@ -295,7 +294,8 @@ (map-region function (+ interrupted-esp 1) frame) (setf next-frame frame next-nether-frame (+ interrupted-esp 1 -2)))))) - (t (error "DIT-frame interrupted unknown CASF funobj: ~S" casf-funobj)))))) + (t (error "DIT-frame interrupted unknown CASF funobj: ~Z, CASF ~S" + casf-funobj casf-frame)))))) (t (error "Don't know how to scavenge across frame ~S of kind ~S." frame funobj))))))) (values))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/primitive-functions.lisp
by ffjeld＠common-lisp.net 04 Jan '05

04 Jan '05

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv1808 Modified Files: primitive-functions.lisp Log Message: Fixing dynamic control transfers, primarily to handle the stack-allocated funobjs, but there seems to be a number of (other) bugs here too. It's not quite working yet, though. Date: Tue Jan 4 17:54:21 2005 Author: ffjeld Index: movitz/losp/muerte/primitive-functions.lisp diff -u movitz/losp/muerte/primitive-functions.lisp:1.58 movitz/losp/muerte/primitive-functions.lisp:1.59 --- movitz/losp/muerte/primitive-functions.lisp:1.58 Tue Dec 14 17:22:08 2004 +++ movitz/losp/muerte/primitive-functions.lisp Tue Jan 4 17:54:20 2005 @@ -1,6 +1,6 @@ ;;;;------------------------------------------------------------------ ;;;; -;;;; Copyright (C) 2001-2004, +;;;; Copyright (C) 2001-2005, ;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Tue Oct 2 21:02:18 2001 ;;;; -;;;; $Id: primitive-functions.lisp,v 1.58 2004/12/14 16:22:08 ffjeld Exp $ +;;;; $Id: primitive-functions.lisp,v 1.59 2005/01/04 16:54:20 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -678,3 +678,17 @@ "This is the global RET trampoline, used to achieve stack discipline." (with-inline-assembly (:returns :multiple-values) (:ret))) + +(define-primitive-function dynamic-jump-next () + "Transfer control to (next) dynamic control transfer target in EDX. +Final target is in raw-scratch0. Doesn't modify current-values." + (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 + (:movl :edi :ebp) ; enter non-local jump stack mode. + (:movl :edx :esp) ; + (:movl (:esp) :edx) ; target stack-frame EBP + (:movl (:edx -4) :esi) ; get target funobj into ESI + (:movl (:esp 8) :edx) ; target jumper number + (:jmp (:esi :edx (:offset movitz-funobj constant0)))))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/interrupt.lisp
by ffjeld＠common-lisp.net 04 Jan '05

04 Jan '05

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv1793 Modified Files: interrupt.lisp Log Message: Fixing dynamic control transfers, primarily to handle the stack-allocated funobjs, but there seems to be a number of (other) bugs here too. It's not quite working yet, though. Date: Tue Jan 4 17:54:17 2005 Author: ffjeld Index: movitz/losp/muerte/interrupt.lisp diff -u movitz/losp/muerte/interrupt.lisp:1.33 movitz/losp/muerte/interrupt.lisp:1.34 --- movitz/losp/muerte/interrupt.lisp:1.33 Tue Nov 23 17:05:59 2004 +++ movitz/losp/muerte/interrupt.lisp Tue Jan 4 17:54:16 2005 @@ -1,6 +1,6 @@ ;;;;------------------------------------------------------------------ ;;;; -;;;; Copyright (C) 2003-2004, +;;;; Copyright (C) 2003-2005, ;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Wed Apr 7 01:50:03 2004 ;;;; -;;;; $Id: interrupt.lisp,v 1.33 2004/11/23 16:05:59 ffjeld Exp $ +;;;; $Id: interrupt.lisp,v 1.34 2005/01/04 16:54:16 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -25,6 +25,7 @@ :ebp :funobj :edi + :dynamic-env :atomically-continuation :raw-scratch0 :ecx :eax :edx :ebx :esi @@ -78,6 +79,8 @@ (let ((ebp (dit-frame-ref stack dit-frame :ebp)) (esp (dit-frame-esp stack dit-frame))) (cond + ((null ebp) ; special mode + (stack-frame-ref stack (dit-frame-ref stack dit-frame :dynamic-env) 0)) ((< esp ebp) ebp) ((> esp ebp) @@ -118,6 +121,7 @@ (:pushl 0) ; 0 'funobj' means default-interrupt-trampoline frame (:pushl :edi) ; (:movl ':nil-value :edi) ; We want NIL! + (:locally (:pushl (:edi (:edi-offset dynamic-env)))) (:locally (:pushl (:edi (:edi-offset atomically-continuation)))) (:locally (:pushl (:edi (:edi-offset raw-scratch0)))) ,@(loop for reg in (sort (copy-list '(:eax :ebx :ecx :edx :esi)) @@ -206,6 +210,12 @@ ;; Interrupted code was non-atomical, the normal case. normal-return + (:movl (:ebp ,(dit-frame-offset :dynamic-env)) :ecx) + (:locally (:cmpl :ecx (:edi (:edi-offset dynamic-env)))) + (:jne '(:sub-program () + ;; This would mean the interrupt handled failed to reset dynamic-env. + (:int 63))) + ;; (:locally (:movl :ecx (:edi (:edi-offset dynamic-env)))) (:movl (:ebp ,(dit-frame-offset :raw-scratch0)) :ecx) (:locally (:movl :ecx (:edi (:edi-offset raw-scratch0)))) (:movl (:ebp ,(dit-frame-offset :scratch1)) :eax)

1 0

[movitz-cvs] CVS update: movitz/special-operators.lisp
by ffjeld＠common-lisp.net 04 Jan '05

04 Jan '05

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv1776 Modified Files: special-operators.lisp Log Message: Fixing dynamic control transfers, primarily to handle the stack-allocated funobjs, but there seems to be a number of (other) bugs here too. It's not quite working yet, though. Date: Tue Jan 4 17:54:11 2005 Author: ffjeld Index: movitz/special-operators.lisp diff -u movitz/special-operators.lisp:1.47 movitz/special-operators.lisp:1.48 --- movitz/special-operators.lisp:1.47 Tue Jan 4 12:35:48 2005 +++ movitz/special-operators.lisp Tue Jan 4 17:54:10 2005 @@ -8,7 +8,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Fri Nov 24 16:22:59 2000 ;;;; -;;;; $Id: special-operators.lisp,v 1.47 2005/01/04 11:35:48 ffjeld Exp $ +;;;; $Id: special-operators.lisp,v 1.48 2005/01/04 16:54:10 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -1210,15 +1210,17 @@ `((:load-lexical ,dynamic-slot-binding :edx) (:locally (:movl :edx (:edi (:edi-offset raw-scratch0)))) ; final continuation (:load-lexical ,next-continuation-step-binding :edx) ; next continuation-step - (:locally (:movl :esi (:edi (:edi-offset scratch1)))) - (:locally (:movl :edx (:edi (:edi-offset dynamic-env)))) ; exit dynamic-env - (:movl :edx :esp) ; enter non-local jump stack mode. - - (:movl (:esp) :edx) ; target stack-frame EBP - (:movl (:edx -4) :esi) ; get target funobj into ESI - - (:movl (:esp 8) :edx) ; target jumper number - (:jmp (:esi :edx ,(slot-offset 'movitz-funobj 'constant0))))))))) + (:locally (:call (:edi (:edi-offset dynamic-jump-next)))))))))) + +;;; (:locally (:movl :esi (:edi (:edi-offset scratch1)))) + + +;;; (:locally (:movl :edx (:edi (:edi-offset dynamic-env)))) ; exit dynamic-env +;;; (:movl :edx :esp) ; enter non-local jump stack mode. +;;; (:movl (:esp) :edx) ; target stack-frame EBP +;;; (:movl (:edx -4) :esi) ; get target funobj into ESI +;;; (:movl (:esp 8) :edx) ; target jumper number +;;; (:jmp (:esi :edx ,(slot-offset 'movitz-funobj 'constant0))))))))) (define-special-operator muerte::with-basic-restart (&all defaults &form form &env env) @@ -1297,10 +1299,10 @@ :form body) `((:leal (:esp ,(+ -12 -4 (* 4 entry-size))) :esp) ,exit-point + (:movl (:esp) :ebp) (:movl (:esp 12) :edx) (:locally (:movl :edx (:edi (:edi-offset dynamic-env)))) - (:popl :ebp) - (:leal (:esp 12) :esp) + (:leal (:esp 16) :esp) )))))))

1 0