Index: /trunk/source/compiler/X86/x862.lisp
===================================================================
--- /trunk/source/compiler/X86/x862.lisp	(revision 14194)
+++ /trunk/source/compiler/X86/x862.lisp	(revision 14195)
@@ -833,5 +833,4 @@
 (defun x862-regmap-note-store (gpr loc)
   (let* ((gpr (%hard-regspec-value gpr)))
-    (assert (< gpr 16) nil "bad regno")
     ;; Any other GPRs that had contained loc no longer do so.
     (dotimes (i 16)
@@ -1463,13 +1462,4 @@
 (defun x862-stack-to-register (seg memspec reg)
   (with-x86-local-vinsn-macros (seg)
-    (let* ((offset (memspec-frame-address-offset memspec)))
-      (if (and *x862-tos-reg*
-               (= offset (- *x862-vstack* *x862-target-node-size*)))
-        (x862-copy-register seg reg *x862-tos-reg*)
-        (! vframe-load reg offset  *x862-vstack*)))))
-
-#+not-yet
-(defun x862-stack-to-register (seg memspec reg)
-  (with-x86-local-vinsn-macros (seg)
     (let* ((offset (memspec-frame-address-offset memspec))
 	   (mask *x862-gpr-locations-valid-mask*)
@@ -1477,5 +1467,4 @@
 	   (regno (%hard-regspec-value reg))
 	   (other (x862-register-for-frame-offset offset regno)))
-      (assert (< regno 16) nil "bad regno")
       (unless (eql regno other)
 	(cond (other
@@ -5385,4 +5374,5 @@
                        (x862-decode-stack encoding)
     (x862-unwind-stack seg xfer target-catch target-cstack target-vstack)
+    (x862-regmap-note-vstack-delta target-vstack *x862-vstack*)
     (setq *x862-undo-count* target-catch 
           *x862-cstack* target-cstack