Insert error traps after full calls inferred not to return

[sbcl.git] / src / assembly / x86-64 / support.lisp

diff --git a/src/assembly/x86-64/support.lisp b/src/assembly/x86-64/support.lisp
index 96f1ef3..c56bf76 100644 (file)
--- a/src/assembly/x86-64/support.lisp
+++ b/src/assembly/x86-64/support.lisp
@@ -9,7 +9,7 @@
 
 (in-package "SB!VM")
 
-(!def-vm-support-routine generate-call-sequence (name style vop)
+(defun generate-call-sequence (name style vop)
   (ecase style
     (:raw
      (values
@@ -24,9 +24,7 @@
               (make-ea :qword :disp (make-fixup ',name :assembly-routine)))
         (inst call temp-reg-tn)
         (note-this-location ,vop :single-value-return)
-        (inst jmp :nc single-value)
-        (move rsp-tn rbx-tn)
-        single-value)
+        (inst cmov :c rsp-tn rbx-tn))
       '((:save-p :compute-only))))
     (:none
      (values
@@ -35,7 +33,7 @@
         (inst jmp temp-reg-tn))
       nil))))
 
-(!def-vm-support-routine generate-return-sequence (style)
+(defun generate-return-sequence (style)
   (ecase style
     (:raw
      `(inst ret))