X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fc-call.lisp;h=f56fd5292191f0aa7069815462aa67c9bd26b5ec;hb=b7eed59f1877263e1af5ad80299e641e8276f77d;hp=04b73a828f297f3f9132feef72156b2f5f90a0ff;hpb=09957fcf57b49ed5ae5f05d62ad12d7ddbfd8e1d;p=sbcl.git diff --git a/src/compiler/x86/c-call.lisp b/src/compiler/x86/c-call.lisp index 04b73a8..f56fd52 100644 --- a/src/compiler/x86/c-call.lisp +++ b/src/compiler/x86/c-call.lisp @@ -12,7 +12,7 @@ (in-package "SB!VM") -;; The MOVE-ARGUMENT vop is going to store args on the stack for +;; The MOVE-ARG vop is going to store args on the stack for ;; call-out. These tn's will be used for that. move-arg is normally ;; used for things going down the stack but C wants to have args ;; indexed in the positive direction. @@ -104,26 +104,18 @@ (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) @@ -132,11 +124,71 @@ (alien-fun-type-result-type type) (make-result-state)))))) + +(deftransform %alien-funcall ((function type &rest args) * * :node node) + (aver (sb!c::constant-continuation-p type)) + (let* ((type (sb!c::continuation-value type)) + (env (sb!c::node-lexenv node)) + (arg-types (alien-fun-type-arg-types type)) + (result-type (alien-fun-type-result-type type))) + (aver (= (length arg-types) (length args))) + (if (or (some #'(lambda (type) + (and (alien-integer-type-p type) + (> (sb!alien::alien-integer-type-bits type) 32))) + arg-types) + (and (alien-integer-type-p result-type) + (> (sb!alien::alien-integer-type-bits result-type) 32))) + (collect ((new-args) (lambda-vars) (new-arg-types)) + (dolist (type arg-types) + (let ((arg (gensym))) + (lambda-vars arg) + (cond ((and (alien-integer-type-p type) + (> (sb!alien::alien-integer-type-bits type) 32)) + (new-args `(logand ,arg #xffffffff)) + (new-args `(ash ,arg -32)) + (new-arg-types (parse-alien-type '(unsigned 32) env)) + (if (alien-integer-type-signed type) + (new-arg-types (parse-alien-type '(signed 32) env)) + (new-arg-types (parse-alien-type '(unsigned 32) env)))) + (t + (new-args arg) + (new-arg-types type))))) + (cond ((and (alien-integer-type-p result-type) + (> (sb!alien::alien-integer-type-bits result-type) 32)) + (let ((new-result-type + (let ((sb!alien::*values-type-okay* t)) + (parse-alien-type + (if (alien-integer-type-signed result-type) + '(values (unsigned 32) (signed 32)) + '(values (unsigned 32) (unsigned 32))) + env)))) + `(lambda (function type ,@(lambda-vars)) + (declare (ignore type)) + (multiple-value-bind (low high) + (%alien-funcall function + ',(make-alien-fun-type + :arg-types (new-arg-types) + :result-type new-result-type) + ,@(new-args)) + (logior low (ash high 32)))))) + (t + `(lambda (function type ,@(lambda-vars)) + (declare (ignore type)) + (%alien-funcall function + ',(make-alien-fun-type + :arg-types (new-arg-types) + :result-type result-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-string)) + (:arg-types (:constant simple-base-string)) (:info foreign-symbol) (:results (res :scs (sap-reg))) (:result-types system-area-pointer) @@ -147,41 +199,33 @@ (: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) + (move eax function) (inst call (make-fixup (extern-alien-name "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)) @@ -209,27 +253,80 @@ (define-vop (alloc-alien-stack-space) (:info amount) + #!+sb-thread (:temporary (:sc unsigned-reg) temp) (:results (result :scs (sap-reg any-reg))) + #!+sb-thread (:generator 0 (aver (not (location= result esp-tn))) (unless (zerop amount) (let ((delta (logandc2 (+ amount 3) 3))) - (inst sub (make-ea :dword - :disp (+ nil-value - (static-symbol-offset '*alien-stack*) - (ash symbol-value-slot word-shift) - (- other-pointer-lowtag))) - delta))) + (inst mov temp + (make-ea :dword + :disp (+ nil-value + (static-symbol-offset '*alien-stack*) + (ash symbol-tls-index-slot word-shift) + (- other-pointer-lowtag)))) + (inst fs-segment-prefix) + (inst sub (make-ea :dword :scale 1 :index temp) delta))) + (load-tl-symbol-value result *alien-stack*)) + #!-sb-thread + (:generator 0 + (aver (not (location= result esp-tn))) + (unless (zerop amount) + (let ((delta (logandc2 (+ amount 3) 3))) + (inst sub (make-ea :dword + :disp (+ nil-value + (static-symbol-offset '*alien-stack*) + (ash symbol-value-slot word-shift) + (- other-pointer-lowtag))) + delta))) (load-symbol-value result *alien-stack*))) (define-vop (dealloc-alien-stack-space) (:info amount) + #!+sb-thread (:temporary (:sc unsigned-reg) temp) + #!+sb-thread (:generator 0 (unless (zerop amount) (let ((delta (logandc2 (+ amount 3) 3))) - (inst add (make-ea :dword + (inst mov temp + (make-ea :dword :disp (+ nil-value (static-symbol-offset '*alien-stack*) - (ash symbol-value-slot word-shift) - (- other-pointer-lowtag))) - delta))))) + (ash symbol-tls-index-slot word-shift) + (- other-pointer-lowtag)))) + (inst fs-segment-prefix) + (inst add (make-ea :dword :scale 1 :index temp) delta)))) + #!-sb-thread + (:generator 0 + (unless (zerop amount) + (let ((delta (logandc2 (+ amount 3) 3))) + (inst add (make-ea :dword + :disp (+ nil-value + (static-symbol-offset '*alien-stack*) + (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)))) +