Index: /branches/ia32/compiler/X86/x86-lap.lisp
===================================================================
--- /branches/ia32/compiler/X86/x86-lap.lisp	(revision 8073)
+++ /branches/ia32/compiler/X86/x86-lap.lisp	(revision 8074)
@@ -1501,10 +1501,10 @@
     (make-x86-lap-label srt-tag)
     (make-x86-lap-label end-code-tag)
-    ;; count of 32-bit words between header and function boundary
+    ;; count of 32-bit words from header to function boundary
     ;; marker, inclusive.
     (x86-lap-directive frag-list :short `(ash (+ (- (:^ ,end-code-tag) 4)
 						 *x86-lap-entry-offset*) -2))
     (emit-x86-lap-label frag-list entry-code-tag)
-    (x86-lap-form '(movl ($ :self) (% fn)) frag-list instruction)
+    (x86-lap-form '(movl ($ :self) (% x8632::fn)) frag-list instruction)
     (dolist (f forms)
       (x86-lap-form f frag-list instruction))
@@ -1542,5 +1542,5 @@
 		  (+ (frag-address frag) (reloc-pos reloc)))
 	    (incf srt-index 4)))))
-    (show-frag-bytes frag-list)
+    ;;(show-frag-bytes frag-list)
     (funcall #-x8632-target #'cross-create-x86-function
              #+x8632-target (if (eq *target-backend* *host-backend*)
Index: /branches/ia32/compiler/X86/x862.lisp
===================================================================
--- /branches/ia32/compiler/X86/x862.lisp	(revision 8073)
+++ /branches/ia32/compiler/X86/x862.lisp	(revision 8074)
@@ -59,5 +59,5 @@
 	   (! mark-as-node ,node))))
       (:x8664
-       (let ()
+       (progn
 	 ,@body)))))
 
@@ -488,5 +488,6 @@
            (*x862-cstack* 0)
 	   (*x86-lap-entry-offset* (target-arch-case
-				    (:x8632 (- x8632::fulltag-misc 3)) ;xxx magic fudge factor
+				    ;;(:x8632 (- x8632::fulltag-misc 3)) ;xxx fudge factor
+				    (:x8632 x8632::fulltag-misc)
 				    (:x8664 x8664::fulltag-function)))
 	   (*x862-result-reg* (target-arch-case
@@ -3120,5 +3121,5 @@
       (declare (fixnum class mode))
       (cond ((= class hard-reg-class-fpr)
-             (make-wired-lreg target::fp1 :class class :mode mode))
+             (make-wired-lreg *x862-fp1* :class class :mode mode))
             ((= class hard-reg-class-gpr)
              (if (= mode hard-reg-class-gpr-mode-node)
@@ -7506,5 +7507,5 @@
 		     (target-arch-case
 		      (:x8632 x8632::fulltag-misc)
-		      (:x8664 x8664::fulltag-misc))))) ;target::fulltag-misc?
+		      (:x8664 x8664::fulltag-misc)))))
 	  (x862-lri seg header (arch::make-vheader nelements subtag))
 	  (target-arch-case