(0 eax-offset)
(1 edx-offset)))
-;; XXX The return handling probably doesn't conform to the ABI
-
(define-alien-type-method (integer :result-tn) (type state)
(let ((num-results (result-state-num-results state)))
(setf (result-state-num-results state) (1+ num-results))
(my-make-wired-tn ptype reg-sc (result-reg-offset num-results)))))
(define-alien-type-method (integer :naturalize-gen) (type alien)
- (if (and (alien-integer-type-signed type)
- (<= (alien-type-bits type) 32))
- `(sign-extend ,alien)
+ (if (<= (alien-type-bits type) 32)
+ (if (alien-integer-type-signed type)
+ `(sign-extend ,alien ,(alien-type-bits type))
+ `(logand ,alien ,(1- (ash 1 (alien-type-bits type)))))
alien))
(define-alien-type-method (system-area-pointer :result-tn) (type state)
(lambda-vars arg)
(cond ((and (alien-integer-type-p type)
(> (sb!alien::alien-integer-type-bits type) 64))
+ ;; CLH: FIXME! This should really be
+ ;; #xffffffffffffffff. nyef says: "Passing
+ ;; 128-bit integers to ALIEN functions on x86-64
+ ;; believed to be broken."
(new-args `(logand ,arg #xffffffff))
(new-args `(ash ,arg -64))
(new-arg-types (parse-alien-type '(unsigned 64) env))
,@(new-args))))))
(sb!c::give-up-ir1-transform))))
-;;; 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)
- (foldable flushable movable))
+;;; The ABI is vague about how signed sub-word integer return values
+;;; are handled, but since gcc versions >=4.3 no longer do sign
+;;; extension in the callee, we need to do it in the caller. FIXME:
+;;; If the value to be extended is known to already be of the target
+;;; type at compile time, we can (and should) elide the extension.
+(defknown sign-extend ((signed-byte 64) t) 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 signed-num (:constant fixnum))
+ (:info size)
(:results (res :scs (signed-reg)))
- (:result-types signed-byte-64)
+ (:result-types fixnum)
(:generator 1
(inst movsxd res
(make-random-tn :kind :normal
- :sc (sc-or-lose 'dword-reg)
+ :sc (sc-or-lose (ecase size
+ (8 'byte-reg)
+ (16 'word-reg)
+ (32 'dword-reg)))
:offset (tn-offset val)))))
-(defun sign-extend (x)
- (if (logbitp 31 x)
- (dpb x (byte 32 0) -1)
- (ldb (byte 32 0) x)))
+#-sb-xc-host
+(defun sign-extend (x size)
+ (declare (type (signed-byte 64) x))
+ (ecase size
+ (8 (sign-extend x size))
+ (16 (sign-extend x size))
+ (32 (sign-extend x size))))
+
+#+sb-xc-host
+(defun sign-extend (x size)
+ (if (logbitp (1- size) x)
+ (dpb x (byte size 0) -1)
+ x))
(define-vop (foreign-symbol-sap)
(:translate foreign-symbol-sap)
(: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
'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)
(:results (result :scs (sap-reg any-reg)))
+ (:result-types system-area-pointer)
(:generator 0
(aver (location= result rsp-tn))
(unless (zerop amount)
(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)
(:info amount)
#!+sb-thread (:temporary (:sc unsigned-reg) temp)
(:results (result :scs (sap-reg any-reg)))
+ (:result-types system-area-pointer)
#!+sb-thread
(:generator 0
(aver (not (location= result rsp-tn)))
(- other-pointer-lowtag)))
delta)))))
-;;; these are not strictly part of the c-call convention, but are
-;;; needed for the WITH-PRESERVED-POINTERS macro used for "locking
-;;; down" lisp objects so that GC won't move them while foreign
-;;; functions go to work.
-
-(define-vop (push-word-on-c-stack)
- (:translate push-word-on-c-stack)
- (:args (val :scs (sap-reg)))
+;;; not strictly part of the c-call convention, but needed for the
+;;; WITH-PINNED-OBJECTS macro used for "locking down" lisp objects so
+;;; that GC won't move them while foreign functions go to work.
+(define-vop (touch-object)
+ (:translate touch-object)
+ (:args (object))
+ (:ignore object)
(:policy :fast-safe)
- (:arg-types system-area-pointer)
- (:generator 2
- (inst push val)))
-
-(define-vop (pop-words-from-c-stack)
- (:translate pop-words-from-c-stack)
- (:args)
- (:arg-types (:constant (unsigned-byte 60)))
- (:info number)
- (:policy :fast-safe)
- (:generator 2
- (inst add rsp-tn (fixnumize number))))
+ (:arg-types t)
+ (:generator 0))
;;; Callbacks
(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
;; 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)
projects / sbcl.git / blobdiff