[movitz-cvs] CVS update: movitz/compiler.lisp - movitz-cvs@common-lisp.net - mailman3.common-lisp.net

20 Nov 2004

Update of /project/movitz/cvsroot/movitz
In directory common-lisp.net:/tmp/cvs-serv22974
Modified Files:
    compiler.lisp 
Log Message:
Fixed some lisp-val to untagged-fixnum-ecx conversions.
Date: Sat Nov 20 18:43:19 2004
Author: ffjeld
Index: movitz/compiler.lisp
diff -u movitz/compiler.lisp:1.113 movitz/compiler.lisp:1.114

--- movitz/compiler.lisp:1.113	Sat Nov 20 02:29:52 2004
+++ movitz/compiler.lisp	Sat Nov 20 18:43:13 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.113 2004/11/20 01:29:52 ffjeld Exp $
+;;;; $Id: compiler.lisp,v 1.114 2004/11/20 17:43:13 ffjeld Exp $
 ;;;;                
 ;;;;------------------------------------------------------------------
@@ -3377,8 +3377,8 @@
    		((:ebx :ecx :edx :esi) `((:movl :eax ,result-mode)))
    		((:eax :single-value) nil)
    		(:untagged-fixnum-ecx
-			 `((:movl :eax :ecx)
-			   (:sarl ,movitz:+movitz-fixnum-shift+ :ecx)))))
+			 `((,*compiler-global-segment-prefix*
+			    :call (:edi ,(global-constant-offset 'unbox-u32)))))))
    	     ((:ebx :ecx :edx)
    	      (assert (not indirect-p))
    	      (unless (eq result-mode lexb-location)
@@ -4836,27 +4836,14 @@
        (values (append code
    		    `((:load-lexical ,returns-provided ,desired-result)))
    	    desired-result))))
-	#+ignore
-	(:untagged-fixnum-eax
-	 (case returns-provided
-	   (:untagged-fixnum-eax
-	    (values code :untagged-fixnum-eax))
-	   ((:eax :single-value :multiple-values :function)
-	    (values (append code
-			    `((:testb ,+movitz-fixnum-zmask+ :al)
-			      (:jnz '(:sub-program (not-an-integer) (:int 107))) ;
-			      (:sarl ,+movitz-fixnum-shift+ :eax)))
-		    :untagged-fixnum-eax))))
    (:untagged-fixnum-ecx
     (case returns-provided
       (:untagged-fixnum-ecx
        (values code :untagged-fixnum-ecx))
       ((:eax :single-value :multiple-values :function)
        (values (append code
-			    `((:testb ,+movitz-fixnum-zmask+ :al)
-			      (:jnz '(:sub-program (not-an-integer) (:int 107))) ;
-			      (:movl :eax :ecx)
-			      (:sarl ,+movitz-fixnum-shift+ :ecx)))
+			    `((,*compiler-global-segment-prefix*
+			       :call (:edi ,(global-constant-offset 'unbox-u32)))))
    	    :untagged-fixnum-ecx))
       (:ecx
        (values (append code

    