(setf (result-state-num-results state) (1+ num-results))
(my-make-wired-tn 'single-float 'single-reg (* num-results 2))))
-#+nil ;;pfw obsolete now?
-(define-alien-type-method (values :result-tn) (type state)
- (mapcar (lambda (type)
- (invoke-alien-type-method :result-tn type state))
- (alien-values-type-values type)))
-
-;;; pfw - from alpha
(define-alien-type-method (values :result-tn) (type state)
(let ((values (alien-values-type-values type)))
- (when (cdr values)
+ (when (> (length values) 2)
(error "Too many result values from c-call."))
- (when values
- (invoke-alien-type-method :result-tn (car values) state))))
+ (mapcar (lambda (type)
+ (invoke-alien-type-method :result-tn type state))
+ values)))
(!def-vm-support-routine make-call-out-tns (type)
(let ((arg-state (make-arg-state)))
(collect ((arg-tns))
- (dolist #+nil ;; this reversed list seems to cause the alien botches!!
- (arg-type (reverse (alien-fun-type-arg-types type)))
- (arg-type (alien-fun-type-arg-types type))
+ (dolist (arg-type (alien-fun-type-arg-types type))
(arg-tns (invoke-alien-type-method :arg-tn arg-type arg-state)))
(values (my-make-wired-tn 'positive-fixnum 'any-reg esp-offset)
(* (arg-state-stack-frame-size arg-state) n-word-bytes)
(deftransform %alien-funcall ((function type &rest args) * * :node node)
- (aver (sb!c::constant-continuation-p type))
- (let* ((type (sb!c::continuation-value type))
+ (aver (sb!c::constant-lvar-p type))
+ (let* ((type (sb!c::lvar-value type))
(env (sb!c::node-lexenv node))
(arg-types (alien-fun-type-arg-types type))
(result-type (alien-fun-type-result-type type)))
,@(new-args))))))
(sb!c::give-up-ir1-transform))))
-
-
-
(define-vop (foreign-symbol-address)
(:translate foreign-symbol-address)
(:policy :fast-safe)
(:args)
- (:arg-types (:constant simple-base-string))
+ (:arg-types (:constant simple-string))
+ (:info foreign-symbol)
+ (:results (res :scs (sap-reg)))
+ (:result-types system-area-pointer)
+ (:generator 2
+ (inst lea res (make-fixup foreign-symbol :foreign))))
+
+#!+linkage-table
+(define-vop (foreign-symbol-dataref-address)
+ (:translate foreign-symbol-dataref-address)
+ (:policy :fast-safe)
+ (:args)
+ (:arg-types (:constant simple-string))
(:info foreign-symbol)
(:results (res :scs (sap-reg)))
(:result-types system-area-pointer)
(:generator 2
- (inst lea res (make-fixup (extern-alien-name foreign-symbol) :foreign))))
+ (inst mov res (make-fixup foreign-symbol :foreign-dataref))))
(define-vop (call-out)
(:args (function :scs (sap-reg))
(args :more t))
(:results (results :more t))
- ;; eax is already wired
- (:temporary (:sc unsigned-reg :offset ecx-offset) ecx)
- (:temporary (:sc unsigned-reg :offset edx-offset) edx)
+ (:temporary (:sc unsigned-reg :offset eax-offset
+ :from :eval :to :result) eax)
+ (:temporary (:sc unsigned-reg :offset ecx-offset
+ :from :eval :to :result) ecx)
+ (:temporary (:sc unsigned-reg :offset edx-offset
+ :from :eval :to :result) edx)
(:node-var node)
(:vop-var vop)
(:save-p t)
(:ignore args ecx edx)
(:generator 0
(cond ((policy node (> space speed))
- (move eax-tn function)
- (inst call (make-fixup (extern-alien-name "call_into_c") :foreign)))
+ (move eax function)
+ (inst call (make-fixup "call_into_c" :foreign)))
(t
;; Setup the NPX for C; all the FP registers need to be
;; empty; pop them all.
- (inst fstp fr0-tn)
- (inst fstp fr0-tn)
- (inst fstp fr0-tn)
- (inst fstp fr0-tn)
- (inst fstp fr0-tn)
- (inst fstp fr0-tn)
- (inst fstp fr0-tn)
- (inst fstp fr0-tn)
+ (dotimes (i 8)
+ (inst fstp fr0-tn))
(inst call function)
;; To give the debugger a clue. XX not really internal-error?
(note-this-location vop :internal-error)
- ;; Restore the NPX for lisp.
- (inst fldz) ; insure no regs are empty
- (inst fldz)
- (inst fldz)
- (inst fldz)
- (inst fldz)
- (inst fldz)
- (inst fldz)
+ ;; Restore the NPX for lisp; ensure no regs are empty
+ (dotimes (i 7)
+ (inst fldz))
(if (and results
(location= (tn-ref-tn results) fr0-tn))
(define-vop (alloc-number-stack-space)
(:info amount)
(:results (result :scs (sap-reg any-reg)))
+ (:node-var node)
(:generator 0
(aver (location= result esp-tn))
+ (when (policy node (= sb!c::float-accuracy 3))
+ (inst sub esp-tn 4)
+ (inst fnstcw (make-ea :word :base esp-tn))
+ (inst wait)
+ (inst or (make-ea :word :base esp-tn) #x300)
+ (inst fldcw (make-ea :word :base esp-tn))
+ (inst wait))
(unless (zerop amount)
(let ((delta (logandc2 (+ amount 3) 3)))
(inst sub esp-tn delta)))
(define-vop (dealloc-number-stack-space)
(:info amount)
+ (:node-var node)
(:generator 0
(unless (zerop amount)
(let ((delta (logandc2 (+ amount 3) 3)))
- (inst add esp-tn delta)))))
+ (inst add esp-tn delta)))
+ (when (policy node (= sb!c::float-accuracy 3))
+ (inst fnstcw (make-ea :word :base esp-tn))
+ (inst wait)
+ (inst and (make-ea :word :base esp-tn) #xfeff)
+ (inst fldcw (make-ea :word :base esp-tn))
+ (inst wait)
+ (inst add esp-tn 4))))
(define-vop (alloc-alien-stack-space)
(:info amount)
(ash symbol-value-slot word-shift)
(- 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)))
+ (: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 29)))
+ (:info number)
+ (:policy :fast-safe)
+ (:generator 2
+ (inst add esp-tn (fixnumize number))))
+
+#-sb-xc-host
+(defun alien-callback-accessor-form (type sp offset)
+ `(deref (sap-alien (sap+ ,sp ,offset) (* ,type))))
+
+#-sb-xc-host
+(defun alien-callback-assembler-wrapper (index return-type arg-types)
+ "Cons up a piece of code which calls call-callback with INDEX and a
+pointer to the arguments."
+ (declare (ignore arg-types))
+ (let* ((segment (make-segment))
+ (eax eax-tn)
+ (edx edx-tn)
+ (ebp ebp-tn)
+ (esp esp-tn)
+ ([ebp-8] (make-ea :dword :base ebp :disp -8))
+ ([ebp-4] (make-ea :dword :base ebp :disp -4)))
+ (assemble (segment)
+ (inst push ebp) ; save old frame pointer
+ (inst mov ebp esp) ; establish new frame
+ (inst mov eax esp) ;
+ (inst sub eax 8) ; place for result
+ (inst push eax) ; arg2
+ (inst add eax 16) ; arguments
+ (inst push eax) ; arg1
+ (inst push (ash index 2)) ; arg0
+ (inst push (get-lisp-obj-address #'enter-alien-callback)) ; function
+ (inst mov eax (foreign-symbol-address-as-integer "funcall3"))
+ (inst call eax)
+ ;; now put the result into the right register
+ (cond
+ ((and (alien-integer-type-p return-type)
+ (eql (alien-type-bits return-type) 64))
+ (inst mov eax [ebp-8])
+ (inst mov edx [ebp-4]))
+ ((or (alien-integer-type-p return-type)
+ (alien-pointer-type-p return-type)
+ (alien-type-= #.(parse-alien-type 'system-area-pointer nil)
+ return-type))
+ (inst mov eax [ebp-8]))
+ ((alien-single-float-type-p return-type)
+ (inst fld [ebp-8]))
+ ((alien-double-float-type-p return-type)
+ (inst fldd [ebp-8]))
+ ((alien-void-type-p return-type))
+ (t
+ (error "unrecognized alien type: ~A" return-type)))
+ (inst mov esp ebp) ; discard frame
+ (inst pop ebp) ; restore frame pointer
+ (inst ret))
+ (finalize-segment segment)
+ ;; Now that the segment is done, convert it to a static
+ ;; vector we can point foreign code to.
+ (let ((buffer (sb!assem::segment-buffer segment)))
+ (make-static-vector (length buffer)
+ :element-type '(unsigned-byte 8)
+ :initial-contents buffer))))
projects / sbcl.git / blobdiff