X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fassembly%2Fx86-64%2Fsupport.lisp;h=62bc41feec88bd493d32ed6f8c9ddd5c2abb5a9a;hb=37b1ed8e9b6faa84832b8251998b5d0eb1f6b307;hp=96f1ef38b35a5bfb17f71d8675887395b8676d77;hpb=f78e2d271f540d68d35b4f41696ce746ff129ee3;p=sbcl.git

diff --git a/src/assembly/x86-64/support.lisp b/src/assembly/x86-64/support.lisp
index 96f1ef3..62bc41f 100644
--- a/src/assembly/x86-64/support.lisp
+++ b/src/assembly/x86-64/support.lisp
@@ -9,33 +9,27 @@
 
 (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
-      `((inst lea temp-reg-tn
-              (make-ea :qword :disp (make-fixup ',name :assembly-routine)))
+      `((inst mov temp-reg-tn (make-fixup ',name :assembly-routine))
         (inst call temp-reg-tn))
       nil))
     (:full-call
      (values
       `((note-this-location ,vop :call-site)
-        (inst lea temp-reg-tn
-              (make-ea :qword :disp (make-fixup ',name :assembly-routine)))
+        (inst mov temp-reg-tn (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)
+        (note-this-location ,vop :single-value-return))
       '((:save-p :compute-only))))
     (:none
      (values
-      `((inst lea temp-reg-tn
-              (make-ea :qword :disp (make-fixup ',name :assembly-routine)))
+      `((inst mov temp-reg-tn (make-fixup ',name :assembly-routine))
         (inst jmp temp-reg-tn))
       nil))))
 
-(!def-vm-support-routine generate-return-sequence (style)
+(defun generate-return-sequence (style)
   (ecase style
     (:raw
      `(inst ret))