Index: /branches/x8664-call/ccl/compiler/X86/X8664/x8664-vinsns.lisp
===================================================================
--- /branches/x8664-call/ccl/compiler/X86/X8664/x8664-vinsns.lisp	(revision 6323)
+++ /branches/x8664-call/ccl/compiler/X86/X8664/x8664-vinsns.lisp	(revision 6324)
@@ -281,7 +281,6 @@
   (leaq (:@ (:^ :back) (:%q x8664::fn)) (:%q x8664::ra0))
   (movq (:@ x8664::symbol.fcell (:% x8664::fname)) (:%q x8664::fn))
+  (:talign 4)
   (jmp (:%q x8664::fn))
-  (:align 3)
-  (:long (:^ :back))
   :back
   (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn)))
@@ -995,7 +994,6 @@
                                            ((entry (:label 1))))
   (leaq (:@ (:^ :back) (:%q x8664::fn)) (:%q x8664::ra0))
+  (:talign 4)
   (jmp (:@ spno))
-  (:align 3)
-  (:long (:^ :back))
   :back
   (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn)))
@@ -1148,9 +1146,6 @@
                 (:apply %hard-regspec-value val)))
    (movq (:%q val) (:%q x8664::arg_z)))
-  (leaq (:@ (:^ :back) (:%q x8664::fn)) (:%q x8664::ra0))
-  (jmp (:@ .SPfix-overflow))
-  (:align 3)
-  (:long (:^ :back))
-  :back
+  (:talign 4)
+  (call (:@ .SPnfix-overflow))
   (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn))
   ((:not (:pred = x8664::arg_z
@@ -1170,9 +1165,6 @@
                 (:apply %hard-regspec-value val)))
    (movq (:%q val) (:%q x8664::arg_z)))
-  (leaq (:@ (:^ :back) (:%q x8664::fn)) (:%q x8664::ra0))
-  (jmp (:@ .SPfix-overflow))
-  (:align 3)
-  (:long (:^ :back))
-  :back
+  (:talign 4)
+  (call (:@ .SPnfix-overflow))
   (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn))
   ((:not (:pred = x8664::arg_z
@@ -1594,7 +1586,6 @@
   (leaq (:@ (:^ :back) (:%q x8664::fn)) (:%q x8664::ra0))
   (movq (:%q x8664::temp0) (:%q x8664::fn))
+  (:talign 4)
   (jmp (:%q x8664::fn))
-  (:align 3)
-  (:long (:^ :back))
   :back
   (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn)))
@@ -1610,7 +1601,6 @@
                                   ((entry (:label 1))))
   (leaq (:@ (:^ :back) (:%q x8664::fn)) (:%q x8664::ra0))
+  (:talign 4)
   (jmp (:@ .SPconslist))
-  (:align 3)
-  (:long (:^ :back))
   :back
   (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn)))
@@ -1688,7 +1678,6 @@
   `(define-x8664-vinsn (,name :call :subprim-call ,@other-attrs) (() () ((entry (:label 1))))
     (leaq (:@ (:^ :back) (:%q x8664::fn)) (:%q x8664::ra0))
+    (:talign 4)
     (jmp (:@ ,spno))
-    (:align 3)
-    (:long (:^ :back))
     :back
     (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn))))
@@ -1779,7 +1768,6 @@
   (leaq (:@ (:^ :back) (:%q x8664::fn)) (:%q x8664::ra0))
   (leaq (:@ (:^ lab)  (:%q x8664::fn)) (:%q x8664::xfn))
+  (:talign 4)
   (jmp (:@ .SPmkcatchmv))
-  (:align 3)
-  (:long (:^ :back))
   :back
   (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn)))
@@ -1790,7 +1778,6 @@
   (leaq (:@ (:^ :back) (:%q x8664::fn)) (:%q x8664::ra0))
   (leaq (:@ (:^ lab)  (:%q x8664::fn)) (:%q x8664::xfn))
+  (:talign 4)
   (jmp (:@ .SPmkcatch1v))
-  (:align 3)
-  (:long (:^ :back))
   :back
   (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn)))
@@ -1822,8 +1809,7 @@
   (cmoveq (:@ x8664::symbol.fcell (:%q x8664::fname)) (:%q x8664::fn))
   (jmp (:%q x8664::fn))
+  (:talign 4)
   :bad
   (uuo-error-not-callable)
-  (:align 3)
-  (:long (:^ :back))
   :back
   (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn)))
@@ -1864,9 +1850,6 @@
      ((sym (:lisp (:ne val))))
      ((entry (:label 1))))
-  (leaq (:@ (:^ :back) (:%q x8664::fn)) (:%q x8664::ra0))
-  (jmp (:@ .SPspecrefcheck))
-  (:align 3)
-  (:long (:^ :back))  
-  :back
+  (:talign 4)
+  (call (:@ .SPnspecrefcheck))
   (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn)) )
 
@@ -1896,7 +1879,6 @@
      ((entry (:label 1))))
   (leaq (:@ (:^ :back) (:%q x8664::fn)) (:%q x8664::ra0))
+  (:talign 4)
   (jmp (:@ .SPspecref))
-  (:align 3)
-  (:long (:^ :back))
   :back
   (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn)))
@@ -1923,8 +1905,4 @@
   (movq (:@ x8664::INTERRUPT-LEVEL-BINDING-INDEX (:%q temp)) (:%q dest)))
 
-(define-x8664-vinsn save-cleanup-context (()
-                                          ((lab :label)))
-  (leaq (:@ (:apply - (:^ lab)) (:%q x8664::xfn)) (:%q x8664::fn))
-  )
 
 
@@ -2975,7 +2953,6 @@
                                                           ((entry (:label 1))))
   (leaq (:@ (:^ :back) (:%q x8664::fn)) (:%q x8664::ra0))
+  (:talign 4)
   (jmp (:@ spno))
-  (:align 3)
-  (:long (:^ :back))
   :back
   (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn)))
@@ -3197,9 +3174,6 @@
       (val :lisp))
      ((entry (:label 1))))
-  (leaq (:@ (:^ :back) (:%q x8664::fn)) (:%q x8664::ra0))
-  (jmp (:@ .SPspecset))
-  (:align 3)
-  (:long (:^ :back))
-  :back
+  (:talign 4)
+  (call (:@ .SPnspecset))
   (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn)))
 
@@ -3279,8 +3253,16 @@
                                                           ((entry (:label 1))))
   (leaq (:@ (:^ :back) (:%q x8664::fn)) (:%q x8664::ra0))
+  (:talign 4)
   (jmp (:@ spno))
-  (:align 3)
-  (:long (:^ :back))
   :back
+  (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn)))
+
+(define-x8664-vinsn (xcall-subprim-2 :call :subprim-call) (((dest t))
+							  ((spno :s32const)
+							   (y t)
+							   (z t))
+                                                          ((entry (:label 1))))
+  (:talign 4)
+  (call (:@ spno))
   (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn)))
 
@@ -3347,7 +3329,6 @@
                                                  ((entry (:label 1))))
   (leaq (:@ (:^ :back) (:%q x8664::fn)) (:%q x8664::ra0))
+  (:talign 4)
   (jmp (:@ .SPthrow))
-  (:align 3)
-  (:long (:^ :back))
   :back
   (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn)))
@@ -3568,9 +3549,9 @@
    ((:pred > n 1)
     (movl (:$l n) (:%l temp))
+    (:talign 4)
     (jmp (:@ .SPunbind-n)))
    ((:pred = n 1)
+    (:talign 4)
     (jmp (:@ .SPunbind)))
-   (:align 3)
-   (:long (:^ :back))   
    :back
    (leaq (:@ (:^ entry) (:% x8664::rip)) (:%q x8664::fn))))