Index: /branches/working-0711/ccl/compiler/X86/X8664/x8664-vinsns.lisp
===================================================================
--- /branches/working-0711/ccl/compiler/X86/X8664/x8664-vinsns.lisp	(revision 7935)
+++ /branches/working-0711/ccl/compiler/X86/X8664/x8664-vinsns.lisp	(revision 7936)
@@ -524,5 +524,5 @@
 (define-x8664-vinsn compare-to-nil (()
                                     ((arg0 t)))
-  (cmpl (:$l x8664::nil-value) (:%l arg0)))
+  (cmpb (:$b x8664::fulltag-nil) (:%b arg0)))
 
 
@@ -764,27 +764,41 @@
 (define-x8664-vinsn extract-tag (((tag :u8))
                                  ((object :lisp)))
-  (movzbl (:%b object) (:%l tag))
-  (andb (:$b x8664::tagmask) (:%b tag)))
+  (movl (:%l object) (:%l tag))
+  (andl (:$b x8664::tagmask) (:%l tag)))
 
 (define-x8664-vinsn extract-tag-fixnum (((tag :imm))
 					((object :lisp)))
-  (leal (:@ (:%q object) 8) (:%l tag))
+  ((:pred =
+          (:apply %hard-regspec-value tag)
+          (:apply %hard-regspec-value object))
+   (shll (:$ub x8664::fixnumshift) (:%l object)))
+  ((:not (:pred =
+          (:apply %hard-regspec-value tag)
+          (:apply %hard-regspec-value object)))
+   (imull (:$b x8664::fixnumone) (:%l object) (:%l tag)))
   (andl (:$b (ash x8664::tagmask x8664::fixnumshift)) (:%l tag)))
 
 (define-x8664-vinsn extract-fulltag (((tag :u8))
                                  ((object :lisp)))
-  (movzbl (:%b object) (:%l tag))
-  (andb (:$b x8664::fulltagmask) (:%b tag)))
+  (movl (:%l object) (:%l tag))
+  (andl (:$b x8664::fulltagmask) (:%l tag)))
 
 (define-x8664-vinsn extract-fulltag-fixnum (((tag :imm))
                                             ((object :lisp)))
-  (leal (:@ (:%q object) 8) (:%l tag))
+  ((:pred =
+          (:apply %hard-regspec-value tag)
+          (:apply %hard-regspec-value object))
+   (shll (:$ub x8664::fixnumshift) (:%l object)))
+  ((:not (:pred =
+          (:apply %hard-regspec-value tag)
+          (:apply %hard-regspec-value object)))
+   (imull (:$b x8664::fixnumone) (:%l object) (:%l tag)))
   (andl (:$b (ash x8664::fulltagmask x8664::fixnumshift)) (:%l tag)))
 
 (define-x8664-vinsn extract-typecode (((tag :u32))
                                       ((object :lisp)))
-  (movzbl (:%b object) (:%l tag))
-  (andb (:$b x8664::tagmask) (:%b tag))
-  (cmpb (:$b x8664::tag-misc) (:%b tag))
+  (movl (:%l object) (:%l tag))
+  (andl (:$b x8664::tagmask) (:%l tag))
+  (cmpl (:$b x8664::tag-misc) (:%l tag))
   (jne :have-tag)
   (movzbl (:@ x8664::misc-subtag-offset (:%q object)) (:%l tag))
@@ -800,5 +814,5 @@
   (movzbl (:@ x8664::misc-subtag-offset (:%q object)) (:%l temp))
   :have-tag
-  (leal (:@ (:%q temp) 8) (:%l tag)))
+  (imulq (:$b x8664::fixnumone) (:%q temp) (:%q tag)))
 
 
@@ -812,9 +826,9 @@
 
 (define-x8664-vinsn cr-bit->boolean (((dest :lisp))
-                                     ((crbit :u8const))
-                                     ((temp :u32)))
-  (movl (:$l x8664::t-value) (:%l temp))
-  (leaq (:@ (- x8664::t-offset) (:%q temp)) (:%q dest))
-  (cmovccl (:$ub crbit) (:%l temp) (:%l dest)))
+                                     ((crbit :u8const)))
+  (movl (:$l x8664::nil-value) (:%l dest))
+  (cmovccl (:$ub crbit) (:@ (+ x8664::t-offset x8664::symbol.vcell) (:%l dest)) (:%l dest)))
+
+
 
 
@@ -1229,9 +1243,15 @@
       (header (:u64 #.x8664::imm0))
       (entry (:label 1))))
-  (jno.pt :done)
+  (jo :overflow)
+  :done
+  (:uuo-section)
   ((:not (:pred = x8664::arg_z
                 (:apply %hard-regspec-value val)))
+   :overflow
    (movq (:%q val) (:%q x8664::arg_z)))
   (:talign 4)
+  ((:pred = x8664::arg_z
+          (:apply %hard-regspec-value val))
+   :overflow)
   (call (:@ .SPfix-overflow))
   (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn))
@@ -1239,5 +1259,5 @@
                 (:apply %hard-regspec-value val)))
    (movq (:%q x8664::arg_z) (:%q val)))
-  :done)
+  (jmp :done))
 
 (define-x8664-vinsn (fix-fixnum-overflow-ool-and-branch :call)
@@ -1248,9 +1268,15 @@
       (header (:u64 #.x8664::imm0))
       (entry (:label 1))))
-  (jno.pt lab)
+  (jo :overflow)
+  (jmp lab)
+  (:uuo-section)
   ((:not (:pred = x8664::arg_z
                 (:apply %hard-regspec-value val)))
+     :overflow
    (movq (:%q val) (:%q x8664::arg_z)))
   (:talign 4)
+  ((:pred = x8664::arg_z
+          (:apply %hard-regspec-value val))
+   :overflow)
   (call (:@ .SPfix-overflow))
   (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn))
@@ -1771,5 +1797,5 @@
 
 (defmacro define-x8664-subprim-jump-vinsn ((name &rest other-attrs) spno)
-  `(define-x8664-vinsn (,name :jump :jumpLR ,@other-attrs) (() ())
+  `(define-x8664-vinsn (,name :jumpLR ,@other-attrs) (() ())
     (jmp (:@ ,spno))))
 
@@ -2914,7 +2940,7 @@
   (movq (:%q object) (:%q tag))
   (je.pt :ok-if-non-negative)
-  (andb (:$b x8664::fulltagmask) (:%b tag))
-  (cmpb (:$b x8664::fulltag-misc) (:%b tag))
-  (jne.pn :bad)
+  (andl (:$b x8664::fulltagmask) (:%l tag))
+  (cmpl (:$b x8664::fulltag-misc) (:%l tag))
+  (jne :bad)
   (cmpq (:$l x8664::two-digit-bignum-header) (:@ x8664::misc-header-offset (:%q object)))
   (je :two)
@@ -2947,5 +2973,5 @@
 
 
-
+;;; set DEST to 
 (define-x8664-vinsn mask-base-char (((dest :u8))
                                     ((src :lisp)))
@@ -3418,12 +3444,13 @@
 ;;; really known, it should probably be inlined (stack-cleanup, value
 ;;; transfer & jump ...)
-(define-x8664-vinsn (throw :jump :jump-unknown) (()
-						 ()
-                                                 ((entry (:label 1))))
+(define-x8664-vinsn (throw :jump-unknown) (()
+                                           ()
+                                           ((entry (:label 1))))
   (leaq (:@ (:^ :back) (:%q x8664::fn)) (:%q x8664::ra0))
   (:talign 4)
   (jmp (:@ .SPthrow))
   :back
-  (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn)))
+  (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn))
+  (uuo-error-reg-not-tag (:%q x8664::temp0) (:$ub x8664::subtag-catch-frame)))