November 2004 - movitz-cvs@common-lisp.net

[movitz-cvs] CVS update: movitz/losp/muerte/basic-macros.lisp
by Frode Vatvedt Fjeld 18 Nov '04

18 Nov '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv27855 Modified Files: basic-macros.lisp Log Message: Changed dynamic binding lookup protocol. Only use the "unbounded" primitive-function, and have the caller check whether the value is the unbound-value or not. And, rename to dynamic-variable-lookup. Date: Thu Nov 18 18:59:03 2004 Author: ffjeld Index: movitz/losp/muerte/basic-macros.lisp diff -u movitz/losp/muerte/basic-macros.lisp:1.46 movitz/losp/muerte/basic-macros.lisp:1.47 --- movitz/losp/muerte/basic-macros.lisp:1.46 Wed Nov 17 14:33:25 2004 +++ movitz/losp/muerte/basic-macros.lisp Thu Nov 18 18:59:03 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Wed Nov 8 18:44:57 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: basic-macros.lisp,v 1.46 2004/11/17 13:33:25 ffjeld Exp $ +;;;; $Id: basic-macros.lisp,v 1.47 2004/11/18 17:59:03 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -446,6 +446,12 @@ (:compile-two-forms (:eax :ebx) ,x ,y) (:cmpl :eax :ebx))))) +#+ignore +(define-compiler-macro eql (&whole form x y &environment env) + `(let ((x ,x) (y ,y)) + (with-inline-assembly (:returns :boolean-zf=1) + (:eql (:lexical-binding x) (:lexical-binding y))))) + (define-compiler-macro eql (&whole form x y &environment env) (cond ((and (movitz:movitz-constantp x env) @@ -1078,7 +1084,7 @@ (:leal (:eax ,(- (movitz:tag :symbol))) :ecx) (:testb 7 :cl) (:jne '(:sub-program () (:int 66))) - (:call-local-pf dynamic-variable-lookup-unbound) + (:call-local-pf dynamic-variable-lookup) (:globally (:cmpl (:edi (:edi-offset unbound-value)) :eax))))) (defmacro define-global-variable (name init-form &optional docstring)

1 0

[movitz-cvs] CVS update: movitz/losp/los0.lisp
by Frode Vatvedt Fjeld 18 Nov '04

18 Nov '04

Update of /project/movitz/cvsroot/movitz/losp In directory common-lisp.net:/tmp/cvs-serv27829 Modified Files: los0.lisp Log Message: Changed dynamic binding lookup protocol. Only use the "unbounded" primitive-function, and have the caller check whether the value is the unbound-value or not. And, rename to dynamic-variable-lookup. Date: Thu Nov 18 18:58:54 2004 Author: ffjeld Index: movitz/losp/los0.lisp diff -u movitz/losp/los0.lisp:1.29 movitz/losp/los0.lisp:1.30 --- movitz/losp/los0.lisp:1.29 Wed Nov 17 15:02:18 2004 +++ movitz/losp/los0.lisp Thu Nov 18 18:58:50 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Fri Dec 1 18:08:32 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: los0.lisp,v 1.29 2004/11/17 14:02:18 ffjeld Exp $ +;;;; $Id: los0.lisp,v 1.30 2004/11/18 17:58:50 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -46,6 +46,8 @@ (in-package muerte.init) +(defun xx (a b) + (eql b #x123456789)) (defun test0 () (ash 1 -1000000000000)) @@ -1494,20 +1496,23 @@ ;;;;;;;;;;;;;;;;;; Shallow binding (define-primitive-function dynamic-variable-install-shallow () - "Install each dynamic binding entry between that in ESP (offset by 4 due to -the call to this primitive-function!) and current dynamic-env. -Preserve EDX." + "Install each dynamic binding entry between that in ESP + (offset by 4 due to the call to this primitive-function!) +and current dynamic-env. Preserve EDX." (with-inline-assembly (:returns :nothing) - (:leal (:esp 4) :ecx) + (:leal (:esp 4) :ecx) ; first entry install-loop - (:locally (:cmpl :ecx (:edi (:edi-offset dynamic-env)))) + (:locally + (:cmpl :ecx (:edi (:edi-offset dynamic-env)))) (:je 'install-completed) - (:movl (:ecx 0) :eax) ; symbol - (:movl (:eax (:offset movitz-symbol value)) :ebx) ; symbol's old-value into EBX - (:movl :ebx (:ecx 4)) ; save old-value in binding's scratch - (:movl (:ecx 8) :ebx) ; new value - (:movl :ebx (:eax (:offset movitz-symbol value))) ; install new value - (:movl (:ecx 12) :ecx) + (:movl (:ecx 0) :eax) ; binding's name + (:movl (:eax (:offset movitz-symbol value)) + :ebx) ; old value into EBX + (:movl :ebx (:ecx 4)) ; save old value in scratch + (:movl (:ecx 8) :ebx) ; new value.. + (:movl :ebx ; ..into symbol's value slot + (:eax (:offset movitz-symbol value))) + (:movl (:ecx 12) :ecx) ; iterate next binding (:jmp 'install-loop) install-completed (:ret))) @@ -1587,14 +1592,6 @@ "Load the dynamic value of SYMBOL into EAX." (with-inline-assembly (:returns :multiple-values) (:movl (:eax (:offset movitz-symbol value)) :eax) - (:globally (:cmpl (:edi (:edi-offset unbound-value)) :eax)) - (:je '(:sub-program (unbound) (:int 99))) - (:ret))) - -(define-primitive-function dynamic-variable-lookup-unbound-shallow (symbol) - "Load the dynamic value of SYMBOL into EAX." - (with-inline-assembly (:returns :multiple-values) - (:movl (:eax (:offset movitz-symbol value)) :eax) (:ret))) (define-primitive-function dynamic-variable-store-shallow (symbol value) @@ -1609,27 +1606,25 @@ (warn "Installing shallow-binding strategy..")) (without-interrupts (macrolet ((install (slot function) - `(prog1 (cons ',slot (%run-time-context-slot ',slot)) - (setf (%run-time-context-slot ',slot) (symbol-value ',function))))) - (prog1 - (list (install muerte:dynamic-variable-install dynamic-variable-install-shallow) - (install muerte:dynamic-variable-uninstall dynamic-variable-uninstall-shallow) - (install muerte::dynamic-unwind-next dynamic-unwind-next-shallow) - (install muerte::dynamic-variable-store dynamic-variable-store-shallow) - (install muerte::dynamic-variable-lookup-unbound dynamic-variable-lookup-unbound-shallow) - (install muerte::dynamic-variable-lookup dynamic-variable-lookup-shallow)) - (labels ((install-shallow-env (env) - "We use this local function in order to install dynamic-env slots + `(setf (%run-time-context-slot ',slot) (symbol-value ',function)))) + (install muerte:dynamic-variable-install dynamic-variable-install-shallow) + (install muerte:dynamic-variable-uninstall dynamic-variable-uninstall-shallow) + (install muerte::dynamic-unwind-next dynamic-unwind-next-shallow) + (install muerte::dynamic-variable-store dynamic-variable-store-shallow) + (install muerte::dynamic-variable-lookup dynamic-variable-lookup-shallow)) + (labels ((install-shallow-env (env) + "We use this local function in order to install dynamic-env slots in reverse order, by depth-first recursion." - (unless (eq 0 env) - (install-shallow-env (memref env 12)) - (let ((name (memref env 0))) - (when (symbolp name) - (setf (memref env 4) - (%symbol-global-value name)) - (setf (%symbol-global-value name) - (memref env 8))))))) - (install-shallow-env (load-global-constant dynamic-env :thread-local t))))))) + (unless (eq 0 env) + (install-shallow-env (memref env 12)) + (let ((name (memref env 0))) + (when (symbolp name) + (setf (memref env 4) + (%symbol-global-value name)) + (setf (%symbol-global-value name) + (memref env 8))))))) + (install-shallow-env (load-global-constant dynamic-env :thread-local t)))) + (values)) (defun deinstall-shallow-binding (&key quiet) (unless quiet @@ -1641,16 +1636,15 @@ (install muerte:dynamic-variable-uninstall) (install muerte::dynamic-unwind-next) (install muerte::dynamic-variable-store) - (install muerte::dynamic-variable-lookup-unbound) - (install muerte::dynamic-variable-lookup) - (loop for env = (load-global-constant dynamic-env :thread-local t) - then (memref env 12) - while (plusp env) - do (let ((name (memref env 0))) - (when (symbolp name) - (setf (%symbol-global-value name) - (memref env 4))))) - (values)))) + (install muerte::dynamic-variable-lookup)) + (loop for env = (load-global-constant dynamic-env :thread-local t) + then (memref env 12) + while (plusp env) + do (let ((name (memref env 0))) + (when (symbolp name) + (setf (%symbol-global-value name) + (memref env 4))))) + (values))) (genesis)

1 0

[movitz-cvs] CVS update: movitz/image.lisp
by Frode Vatvedt Fjeld 18 Nov '04

18 Nov '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv27803 Modified Files: image.lisp Log Message: Changed dynamic binding lookup protocol. Only use the "unbounded" primitive-function, and have the caller check whether the value is the unbound-value or not. And, rename to dynamic-variable-lookup. Date: Thu Nov 18 18:58:46 2004 Author: ffjeld Index: movitz/image.lisp diff -u movitz/image.lisp:1.79 movitz/image.lisp:1.80 --- movitz/image.lisp:1.79 Wed Nov 17 14:32:54 2004 +++ movitz/image.lisp Thu Nov 18 18:58:41 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Sun Oct 22 00:22:43 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: image.lisp,v 1.79 2004/11/17 13:32:54 ffjeld Exp $ +;;;; $Id: image.lisp,v 1.80 2004/11/18 17:58:41 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -161,11 +161,6 @@ :map-binary-write 'movitz-intern-code-vector :map-binary-read-delayed 'movitz-word-code-vector :binary-tag :primitive-function) - (dynamic-variable-lookup-unbound - :map-binary-write 'movitz-intern-code-vector - :binary-tag :primitive-function - :map-binary-read-delayed 'movitz-word-code-vector - :binary-type code-vector-word) (dynamic-variable-lookup :map-binary-write 'movitz-intern-code-vector :binary-tag :primitive-function

1 0

[movitz-cvs] CVS update: movitz/compiler.lisp
by Frode Vatvedt Fjeld 18 Nov '04

18 Nov '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv27786 Modified Files: compiler.lisp Log Message: Changed dynamic binding lookup protocol. Only use the "unbounded" primitive-function, and have the caller check whether the value is the unbound-value or not. And, rename to dynamic-variable-lookup. Date: Thu Nov 18 18:58:37 2004 Author: ffjeld Index: movitz/compiler.lisp diff -u movitz/compiler.lisp:1.107 movitz/compiler.lisp:1.108 --- movitz/compiler.lisp:1.107 Wed Nov 17 14:32:46 2004 +++ movitz/compiler.lisp Thu Nov 18 18:58:35 2004 @@ -8,7 +8,7 @@ ;;;; Created at: Wed Oct 25 12:30:49 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: compiler.lisp,v 1.107 2004/11/17 13:32:46 ffjeld Exp $ +;;;; $Id: compiler.lisp,v 1.108 2004/11/18 17:58:35 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -5602,7 +5602,11 @@ :modifies nil :final-form form :code `((:load-constant ,form :eax) - (:call (:edi ,(global-constant-offset 'dynamic-variable-lookup)))))) + (,*compiler-local-segment-prefix* + :call (:edi ,(global-constant-offset 'dynamic-variable-lookup))) + (,*compiler-local-segment-prefix* + :cmpl :eax (:edi ,(global-constant-offset 'unbound-value))) + (:je '(:sub-program () (:int 99)))))) (t (check-type binding dynamic-binding) (compiler-values () :returns :eax @@ -5610,7 +5614,11 @@ :modifies nil :final-form form :code `((:load-constant ,form :eax) - (:call (:edi ,(global-constant-offset 'dynamic-variable-lookup)))))))))) + (,*compiler-local-segment-prefix* + :call (:edi ,(global-constant-offset 'dynamic-variable-lookup))) + (,*compiler-local-segment-prefix* + :cmpl :eax (:edi ,(global-constant-offset 'unbound-value))) + (:je '(:sub-program () (:int 99)))))))))) (define-compiler compile-lambda-form (&form form) "3.1.2.2.4 Lambda Forms" @@ -6486,3 +6494,38 @@ `((:movl :eax ,destination)))) (binding (make-store-lexical destination :eax nil frame-map)))))))))) + +;;;;;;; + +(define-find-read-bindings :eql (x y) + (list x y)) + +(define-extended-code-expander :eql (instruction funobj frame-map) + (destructuring-bind (x y) + (cdr instruction) + (let* ((x-type (apply #'encoded-type-decode (binding-store-type x))) + (y-type (apply #'encoded-type-decode (binding-store-type y))) + (x-singleton (type-specifier-singleton x-type)) + (y-singleton (type-specifier-singleton y-type))) + (when (and y-singleton (not x-singleton)) + (rotatef x y) + (rotatef x-type y-type) + (rotatef x-singleton y-singleton)) + (warn "eql ~S ~S" x-singleton y-singleton) + (cond + ((and x-singleton y-singleton) + (break "Constant EQL: ~S ~S" (car x-singleton) (car y-singleton))) + ((or (movitz-subtypep x-type 'fixnum) + (movitz-subtypep x-type 'character) + (movitz-subtypep y-type 'fixnum) + (movitz-subtypep y-type 'character)) + (break "EQL that is EQ.")) + (t (append (make-load-lexical x :eax funobj nil frame-map) + (make-load-lexical y :ebx funobj nil frame-map) + (let ((eql-done (gensym "eql-done-"))) + `((:cmpl :eax :ebx) + (:je ',eql-done) + (,*compiler-global-segment-prefix* + :movl (:edi ,(global-constant-offset 'complicated-eql)) :esi) + (:call (:esi ,(bt:slot-offset 'movitz-funobj 'code-vector%2op))) + ,eql-done))))))))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/eval.lisp
by Frode Vatvedt Fjeld 18 Nov '04

18 Nov '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv27760 Modified Files: eval.lisp Log Message: Added a trivial proclaim. Date: Thu Nov 18 18:57:14 2004 Author: ffjeld Index: movitz/losp/muerte/eval.lisp diff -u movitz/losp/muerte/eval.lisp:1.14 movitz/losp/muerte/eval.lisp:1.15 --- movitz/losp/muerte/eval.lisp:1.14 Fri Oct 22 14:33:27 2004 +++ movitz/losp/muerte/eval.lisp Thu Nov 18 18:57:14 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Fri Oct 19 21:15:12 2001 ;;;; -;;;; $Id: eval.lisp,v 1.14 2004/10/22 12:33:27 ffjeld Exp $ +;;;; $Id: eval.lisp,v 1.15 2004/11/18 17:57:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -439,3 +439,8 @@ (setf (symbol-function name) function)) t nil))) + +(defun proclaim (declaration) + ;; What do do? + (warn "Unknown declaration: ~S" declaration) + (values))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/typep.lisp
by Frode Vatvedt Fjeld 18 Nov '04

18 Nov '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv28275 Modified Files: typep.lisp Log Message: Added some trival cases for (coerce .. 'list) and (coerce .. 'vector) Date: Thu Nov 18 10:28:53 2004 Author: ffjeld Index: movitz/losp/muerte/typep.lisp diff -u movitz/losp/muerte/typep.lisp:1.37 movitz/losp/muerte/typep.lisp:1.38 --- movitz/losp/muerte/typep.lisp:1.37 Wed Sep 15 12:22:59 2004 +++ movitz/losp/muerte/typep.lisp Thu Nov 18 10:28:52 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Fri Dec 8 11:07:53 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: typep.lisp,v 1.37 2004/09/15 10:22:59 ffjeld Exp $ +;;;; $Id: typep.lisp,v 1.38 2004/11/18 09:28:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -620,5 +620,11 @@ (cond ((typep object result-type) object) + ((and (eq result-type 'list) + (typep object 'sequence)) + (map 'list #'identity object)) + ((and (typep object 'sequence) + (member result-type '(vector array))) + (make-array (length object) :initial-contents object)) (t (error "Don't know how to coerce ~S to ~S." object result-type))))

1 0

[movitz-cvs] CVS update: movitz/losp/los0.lisp
by Frode Vatvedt Fjeld 17 Nov '04

17 Nov '04

Update of /project/movitz/cvsroot/movitz/losp In directory common-lisp.net:/tmp/cvs-serv25211 Modified Files: los0.lisp Log Message: Added deinstall-shallow-binding, so we can flip back and forth between shallow and deep binding at any time. Date: Wed Nov 17 15:02:19 2004 Author: ffjeld Index: movitz/losp/los0.lisp diff -u movitz/losp/los0.lisp:1.28 movitz/losp/los0.lisp:1.29 --- movitz/losp/los0.lisp:1.28 Wed Nov 17 14:33:11 2004 +++ movitz/losp/los0.lisp Wed Nov 17 15:02:18 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Fri Dec 1 18:08:32 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: los0.lisp,v 1.28 2004/11/17 13:33:11 ffjeld Exp $ +;;;; $Id: los0.lisp,v 1.29 2004/11/17 14:02:18 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -1605,31 +1605,52 @@ (:ret))) (defun install-shallow-binding (&key quiet) + (unless quiet + (warn "Installing shallow-binding strategy..")) (without-interrupts - (unless quiet - (warn "Installing shallow-binding strategy..")) (macrolet ((install (slot function) `(prog1 (cons ',slot (%run-time-context-slot ',slot)) (setf (%run-time-context-slot ',slot) (symbol-value ',function))))) - (list (install muerte:dynamic-variable-install dynamic-variable-install-shallow) - (install muerte:dynamic-variable-uninstall dynamic-variable-uninstall-shallow) - (install muerte::dynamic-unwind-next dynamic-unwind-next-shallow) - (install muerte::dynamic-variable-store dynamic-variable-store-shallow) - (install muerte::dynamic-variable-lookup-unbound dynamic-variable-lookup-unbound-shallow) - (prog1 (install muerte::dynamic-variable-lookup dynamic-variable-lookup-shallow) - (labels ((install-shallow-env (env) - "We use this local function in order to install dynamic-env slots - in reverse order, by depth-first recursion." - (unless (eq 0 env) - (install-shallow-env (memref env 12)) - (let ((name (memref env 0))) - (when (symbolp name) - (setf (memref env 4) - (%symbol-global-value name)) - (setf (%symbol-global-value name) - (memref env 8))))))) - (install-shallow-env (load-global-constant dynamic-env - :thread-local t)))))))) + (prog1 + (list (install muerte:dynamic-variable-install dynamic-variable-install-shallow) + (install muerte:dynamic-variable-uninstall dynamic-variable-uninstall-shallow) + (install muerte::dynamic-unwind-next dynamic-unwind-next-shallow) + (install muerte::dynamic-variable-store dynamic-variable-store-shallow) + (install muerte::dynamic-variable-lookup-unbound dynamic-variable-lookup-unbound-shallow) + (install muerte::dynamic-variable-lookup dynamic-variable-lookup-shallow)) + (labels ((install-shallow-env (env) + "We use this local function in order to install dynamic-env slots + in reverse order, by depth-first recursion." + (unless (eq 0 env) + (install-shallow-env (memref env 12)) + (let ((name (memref env 0))) + (when (symbolp name) + (setf (memref env 4) + (%symbol-global-value name)) + (setf (%symbol-global-value name) + (memref env 8))))))) + (install-shallow-env (load-global-constant dynamic-env :thread-local t))))))) + +(defun deinstall-shallow-binding (&key quiet) + (unless quiet + (warn "Deinstalling shallow-binding strategy..")) + (without-interrupts + (macrolet ((install (slot) + `(setf (%run-time-context-slot ',slot) (symbol-value ',slot)))) + (install muerte:dynamic-variable-install) + (install muerte:dynamic-variable-uninstall) + (install muerte::dynamic-unwind-next) + (install muerte::dynamic-variable-store) + (install muerte::dynamic-variable-lookup-unbound) + (install muerte::dynamic-variable-lookup) + (loop for env = (load-global-constant dynamic-env :thread-local t) + then (memref env 12) + while (plusp env) + do (let ((name (memref env 0))) + (when (symbolp name) + (setf (%symbol-global-value name) + (memref env 4))))) + (values)))) (genesis)

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/symbols.lisp
by Frode Vatvedt Fjeld 17 Nov '04

17 Nov '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv23460 Modified Files: symbols.lisp Log Message: Renamed dynamic-load to dynamic-variable-lookup, and dynamic-store to dynamic-variable-store. Date: Wed Nov 17 14:33:42 2004 Author: ffjeld Index: movitz/losp/muerte/symbols.lisp diff -u movitz/losp/muerte/symbols.lisp:1.23 movitz/losp/muerte/symbols.lisp:1.24 --- movitz/losp/muerte/symbols.lisp:1.23 Thu Nov 11 20:25:25 2004 +++ movitz/losp/muerte/symbols.lisp Wed Nov 17 14:33:42 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Tue Sep 4 23:55:41 2001 ;;;; -;;;; $Id: symbols.lisp,v 1.23 2004/11/11 19:25:25 ffjeld Exp $ +;;;; $Id: symbols.lisp,v 1.24 2004/11/17 13:33:42 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -45,14 +45,14 @@ (symbol (with-inline-assembly (:returns :eax) (:compile-form (:result-mode :eax) symbol) - (:call-local-pf dynamic-load))))) + (:call-local-pf dynamic-variable-lookup))))) (defun %unbounded-symbol-value (symbol) "Return the symbol's value without checking if it's bound or not." (check-type symbol symbol) (with-inline-assembly (:returns :eax) (:compile-form (:result-mode :eax) symbol) - (:call-local-pf dynamic-load-unprotected) + (:call-local-pf dynamic-variable-lookup-unbound) done)) (defun (setf symbol-value) (value symbol) @@ -63,7 +63,7 @@ (with-inline-assembly (:returns :ebx) (:compile-form (:result-mode :eax) symbol) (:compile-form (:result-mode :ebx) value) - (:call-local-pf dynamic-store))))) + (:call-local-pf dynamic-variable-store))))) (defun set (symbol value) (setf (symbol-value symbol) value))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/primitive-functions.lisp
by Frode Vatvedt Fjeld 17 Nov '04

17 Nov '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv23434 Modified Files: primitive-functions.lisp Log Message: Renamed dynamic-load to dynamic-variable-lookup, and dynamic-store to dynamic-variable-store. Date: Wed Nov 17 14:33:34 2004 Author: ffjeld Index: movitz/losp/muerte/primitive-functions.lisp diff -u movitz/losp/muerte/primitive-functions.lisp:1.53 movitz/losp/muerte/primitive-functions.lisp:1.54 --- movitz/losp/muerte/primitive-functions.lisp:1.53 Sat Nov 13 17:10:21 2004 +++ movitz/losp/muerte/primitive-functions.lisp Wed Nov 17 14:33:34 2004 @@ -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.53 2004/11/13 16:10:21 ffjeld Exp $ +;;;; $Id: primitive-functions.lisp,v 1.54 2004/11/17 13:33:34 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -162,7 +162,7 @@ ;; Default binding strategy is naive deep binding, so this is a NOP. (:ret))) -(define-primitive-function dynamic-load (symbol) +(define-primitive-function dynamic-variable-lookup (symbol) "Load the dynamic value of SYMBOL into EAX." (with-inline-assembly (:returns :multiple-values) (:locally (:movl (:edi (:edi-offset dynamic-env)) :ecx)) @@ -194,7 +194,7 @@ (:je '(:sub-program (unbound) (:int 99))) (:ret))) -(define-primitive-function dynamic-load-unprotected (symbol) +(define-primitive-function dynamic-variable-lookup-unbound (symbol) "Load the dynamic value of SYMBOL into EAX. If unbound, return unbound-value." (with-inline-assembly (:returns :multiple-values) (:locally (:movl (:edi (:edi-offset dynamic-env)) :ecx)) @@ -220,7 +220,7 @@ :movl (:eax (:offset movitz-symbol value)) :eax) (:ret))) -(define-primitive-function dynamic-store (symbol value) +(define-primitive-function dynamic-variable-store (symbol value) "Store VALUE (ebx) in the dynamic binding of SYMBOL (eax). Preserves EBX and EAX." (with-inline-assembly (:returns :multiple-values)

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/basic-macros.lisp
by Frode Vatvedt Fjeld 17 Nov '04

17 Nov '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv23408 Modified Files: basic-macros.lisp Log Message: Renamed dynamic-load to dynamic-variable-lookup, and dynamic-store to dynamic-variable-store. Date: Wed Nov 17 14:33:27 2004 Author: ffjeld Index: movitz/losp/muerte/basic-macros.lisp diff -u movitz/losp/muerte/basic-macros.lisp:1.45 movitz/losp/muerte/basic-macros.lisp:1.46 --- movitz/losp/muerte/basic-macros.lisp:1.45 Fri Nov 12 15:52:05 2004 +++ movitz/losp/muerte/basic-macros.lisp Wed Nov 17 14:33:25 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Wed Nov 8 18:44:57 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: basic-macros.lisp,v 1.45 2004/11/12 14:52:05 ffjeld Exp $ +;;;; $Id: basic-macros.lisp,v 1.46 2004/11/17 13:33:25 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -1078,7 +1078,7 @@ (:leal (:eax ,(- (movitz:tag :symbol))) :ecx) (:testb 7 :cl) (:jne '(:sub-program () (:int 66))) - (:call-local-pf dynamic-load-unprotected) + (:call-local-pf dynamic-variable-lookup-unbound) (:globally (:cmpl (:edi (:edi-offset unbound-value)) :eax))))) (defmacro define-global-variable (name init-form &optional docstring)

1 0