X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Fc-call.lisp;h=32fb566f0d3a5a22f398c7574984cada9b97016c;hb=0e7a9105ae992fc4befa37846c42f298e12918c0;hp=a45217fd9b568d5d3f8394ab391731930c26e07c;hpb=253daeec9c0ac81c2239e9148ee806e7ad647f7e;p=sbcl.git diff --git a/src/compiler/x86-64/c-call.lisp b/src/compiler/x86-64/c-call.lisp index a45217f..32fb566 100644 --- a/src/compiler/x86-64/c-call.lisp +++ b/src/compiler/x86-64/c-call.lisp @@ -190,16 +190,16 @@ ;;; The ABI specifies that signed short/int's are returned as 32-bit ;;; values. Negative values need to be sign-extended to 64-bits (done ;;; in a :NATURALIZE-GEN alien-type-method). -(defknown sign-extend ((signed-byte 64)) (signed-byte 64) +(defknown sign-extend ((signed-byte 32)) fixnum (foldable flushable movable)) (define-vop (sign-extend) (:translate sign-extend) (:policy :fast-safe) (:args (val :scs (signed-reg))) - (:arg-types signed-byte-64) + (:arg-types fixnum) (:results (res :scs (signed-reg))) - (:result-types signed-byte-64) + (:result-types fixnum) (:generator 1 (inst movsxd res (make-random-tn :kind :normal @@ -207,9 +207,8 @@ :offset (tn-offset val))))) (defun sign-extend (x) - (if (logbitp 31 x) - (dpb x (byte 32 0) -1) - (ldb (byte 32 0) x))) + (declare (type (signed-byte 32) x)) + (sign-extend x)) (define-vop (foreign-symbol-sap) (:translate foreign-symbol-sap) @@ -243,6 +242,8 @@ (:vop-var vop) (:save-p t) (:generator 0 + ;; ABI: Direction flag must be clear on function entry. -- JES, 2006-01-20 + (inst cld) ;; ABI: AL contains amount of arguments passed in XMM registers ;; for vararg calls. (move-immediate rax @@ -252,12 +253,7 @@ 'float-registers))) (inst call function) ;; To give the debugger a clue. XX not really internal-error? - (note-this-location vop :internal-error) - ;; FLOAT15 needs to contain FP zero in Lispland - (let ((float15 (make-random-tn :kind :normal - :sc (sc-or-lose 'double-reg) - :offset float15-offset))) - (inst xorpd float15 float15)))) + (note-this-location vop :internal-error))) (define-vop (alloc-number-stack-space) (:info amount) @@ -268,7 +264,7 @@ (let ((delta (logandc2 (+ amount 7) 7))) (inst sub rsp-tn delta))) ;; C stack must be 16 byte aligned - (inst and rsp-tn #xfffffff0) + (inst and rsp-tn -16) (move result rsp-tn))) (define-vop (dealloc-number-stack-space) @@ -382,7 +378,10 @@ (rsp rsp-tn) (xmm0 float0-tn) ([rsp] (make-ea :qword :base rsp :disp 0)) - (words-processed 0) + ;; How many arguments have been copied + (arg-count 0) + ;; How many arguments have been copied from the stack + (stack-argument-count 0) (gprs (mapcar (make-tn-maker 'any-reg) *c-call-register-arg-offsets*)) (fprs (mapcar (make-tn-maker 'double-reg) ;; Only 8 first XMM registers are used for @@ -394,26 +393,57 @@ ;; Copy arguments from registers to stack (dolist (type argument-types) (let ((integerp (not (alien-float-type-p type))) - (stack-tn (make-ea :qword :base rsp - :disp (* words-processed - n-word-bytes)))) - (incf words-processed) + ;; A TN pointing to the stack location where the + ;; current argument should be stored for the purposes + ;; of ENTER-ALIEN-CALLBACK. + (target-tn (make-ea :qword :base rsp + :disp (* arg-count + n-word-bytes))) + ;; A TN pointing to the stack location that contains + ;; the next argument passed on the stack. + (stack-arg-tn (make-ea :qword :base rsp + :disp (* (+ 1 + (length argument-types) + stack-argument-count) + n-word-bytes)))) + (incf arg-count) (cond (integerp (let ((gpr (pop gprs))) - (if gpr - (inst mov stack-tn gpr) - (out-of-registers-error)))) + ;; Argument not in register, copy it from the old + ;; stack location to a temporary register. + (unless gpr + (incf stack-argument-count) + (setf gpr temp-reg-tn) + (inst mov gpr stack-arg-tn)) + ;; Copy from either argument register or temporary + ;; register to target. + (inst mov target-tn gpr))) ((or (alien-single-float-type-p type) (alien-double-float-type-p type)) (let ((fpr (pop fprs))) - (if fpr - (inst movq stack-tn fpr) - (out-of-registers-error)))) + (cond (fpr + ;; Copy from float register to target location. + (inst movq target-tn fpr)) + (t + ;; Not in float register. Copy from stack to + ;; temporary (general purpose) register, and + ;; from there to the target location. + (incf stack-argument-count) + (inst mov temp-reg-tn stack-arg-tn) + (inst mov target-tn temp-reg-tn))))) (t (bug "Unknown alien floating point type: ~S" type))))) ;; arg0 to FUNCALL3 (function) - (inst mov rdi (get-lisp-obj-address #'enter-alien-callback)) + ;; + ;; Indirect the access to ENTER-ALIEN-CALLBACK through + ;; the symbol-value slot of SB-ALIEN::*ENTER-ALIEN-CALLBACK* + ;; to ensure it'll work even if the GC moves ENTER-ALIEN-CALLBACK. + ;; Skip any SB-THREAD TLS magic, since we don't expect anyone + ;; to rebind the variable. -- JES, 2006-01-01 + (inst mov rdi (+ nil-value (static-symbol-offset + 'sb!alien::*enter-alien-callback*))) + (loadw rdi rdi symbol-value-slot other-pointer-lowtag) ;; arg0 to ENTER-ALIEN-CALLBACK (trampoline index) (inst mov rsi (fixnumize index)) ;; arg1 to ENTER-ALIEN-CALLBACK (pointer to argument vector)