[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-serv26054

Modified Files:
	primitive-functions.lisp 
Log Message:
Use copy-funobj-code-vector-slots to initialize stack-allocated funobjs.

Date: Mon Jan 10 09:19:08 2005
Author: ffjeld

Index: movitz/losp/muerte/primitive-functions.lisp
diff -u movitz/losp/muerte/primitive-functions.lisp:1.59 movitz/losp/muerte/primitive-functions.lisp:1.60
--- movitz/losp/muerte/primitive-functions.lisp:1.59	Tue Jan  4 17:54:20 2005
+++ movitz/losp/muerte/primitive-functions.lisp	Mon Jan 10 09:19:06 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.59 2005/01/04 16:54:20 ffjeld Exp $
+;;;; $Id: primitive-functions.lisp,v 1.60 2005/01/10 08:19:06 ffjeld Exp $
 ;;;;                
 ;;;;------------------------------------------------------------------
 
@@ -692,3 +692,34 @@
     (:movl (:edx -4) :esi)		; get target funobj into ESI
     (:movl (:esp 8) :edx)		; target jumper number
     (:jmp (:esi :edx (:offset movitz-funobj constant0)))))
+
+(define-primitive-function copy-funobj-code-vector-slots ()
+  "Copy the (unsafe) code-vector and jumper slots of the funobj in EAX to that in EBX."
+  ;; Set up thread-atomical execution
+  (with-inline-assembly (:returns :eax)
+    (:locally (:movl #.(movitz::atomically-continuation-simple-pf 'copy-funobj-code-vector-slots)
+		     (:edi (:edi-offset atomically-continuation))))
+    (:movl (:eax (:offset movitz-funobj code-vector)) :ecx)
+    (:movl :ecx (:ebx (:offset movitz-funobj code-vector)))
+
+    (:movl (:eax (:offset movitz-funobj code-vector%1op)) :ecx)
+    (:movl :ecx (:ebx (:offset movitz-funobj code-vector%1op)))    
+
+    (:movl (:eax (:offset movitz-funobj code-vector%2op)) :ecx)
+    (:movl :ecx (:ebx (:offset movitz-funobj code-vector%2op)))    
+
+    (:movl (:eax (:offset movitz-funobj code-vector%3op)) :ecx)
+    (:movl :ecx (:ebx (:offset movitz-funobj code-vector%3op)))
+    
+    (:movl (:eax (:offset movitz-funobj num-jumpers)) :edx)
+    (:andl #xffff :edx)
+    (:jnz 'copy-jumpers)
+    (:locally (:movl 0 (:edi (:edi-offset atomically-continuation))))
+    (:ret)
+   copy-jumpers
+    (:movl (:eax :edx (:offset movitz-funobj constant0 -4)) :ecx)
+    (:movl :ecx (:ebx :edx (:offset movitz-funobj constant0 -4)))
+    (:subl 4 :edx)
+    (:jnz 'copy-jumpers)
+    (:locally (:movl 0 (:edi (:edi-offset atomically-continuation))))
+    (:ret)))