Handle run-program with :directory nil.

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

diff --git a/src/assembly/x86-64/arith.lisp b/src/assembly/x86-64/arith.lisp
index c816bdf..6a1fe24 100644 (file)
--- a/src/assembly/x86-64/arith.lisp
+++ b/src/assembly/x86-64/arith.lisp
@@ -21,9 +21,7 @@
                                         (:policy :safe)
                                         (:save-p t))
                 ((:arg x (descriptor-reg any-reg) rdx-offset)
-                 (:arg y (descriptor-reg any-reg)
-                       ;; this seems wrong esi-offset -- FIXME: What's it mean?
-                       rdi-offset)
+                 (:arg y (descriptor-reg any-reg) rdi-offset)
 
                  (:res res (descriptor-reg any-reg) rdx-offset)
 
@@ -224,8 +222,7 @@
                 (:generator 10
                    (move rdx x)
                    (move rdi y)
-                   (inst lea rcx (make-ea :qword
-                                          :disp (make-fixup ',name :assembly-routine)))
+                   (inst mov rcx (make-fixup ',name :assembly-routine))
                    (inst call rcx)))))
 
   (define-cond-assem-rtn generic-< < two-arg-< :l)
@@ -293,8 +290,7 @@
   (:generator 10
     (move rdx x)
     (move rdi y)
-    (inst lea rcx (make-ea :qword
-                           :disp (make-fixup 'generic-eql :assembly-routine)))
+    (inst mov rcx (make-fixup 'generic-eql :assembly-routine))
     (inst call rcx)))
 
 #+sb-assembling
@@ -359,6 +355,5 @@
   (:generator 10
     (move rdx x)
     (move rdi y)
-    (inst lea rcx (make-ea :qword
-                           :disp (make-fixup 'generic-= :assembly-routine)))
+    (inst mov rcx (make-fixup 'generic-= :assembly-routine))
     (inst call rcx)))