X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fc-call.lisp;h=3c5ffae2224e0da51ba26c8374c7729d34b8bf72;hb=b83353d9f998e5c0e34604b5593df70c66d2c510;hp=c07deae9a614e7a8aafbdc11a7ee2bb932821d96;hpb=a1464a17e2eac7d45bb4316bcd969ab6a2e620db;p=sbcl.git diff --git a/src/compiler/x86/c-call.lisp b/src/compiler/x86/c-call.lisp index c07deae..3c5ffae 100644 --- a/src/compiler/x86/c-call.lisp +++ b/src/compiler/x86/c-call.lisp @@ -78,6 +78,13 @@ (values 'unsigned-byte-32 'unsigned-reg)) (my-make-wired-tn ptype reg-sc (result-reg-offset num-results))))) +(define-alien-type-method (integer :naturalize-gen) (type alien) + (if (<= (alien-type-bits type) 16) + (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) (declare (ignore type)) (let ((num-results (result-state-num-results state))) @@ -112,7 +119,7 @@ (invoke-alien-type-method :result-tn type state)) values))) -(!def-vm-support-routine make-call-out-tns (type) +(defun make-call-out-tns (type) (let ((arg-state (make-arg-state))) (collect ((arg-tns)) (dolist (arg-type (alien-fun-type-arg-types type)) @@ -181,6 +188,47 @@ ,@(new-args)))))) (sb!c::give-up-ir1-transform)))) +;;; 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 32) t) fixnum + (foldable flushable movable)) + +(define-vop (sign-extend) + (:translate sign-extend) + (:policy :fast-safe) + ;; Need to wire this to EAX since in x86 some dword registers don't + ;; have a matching word or byte register. + (:args (val :scs (signed-reg) :target eax)) + (:temporary (:sc signed-reg :offset eax-offset :from :eval :to :result) eax) + (:arg-types signed-num (:constant fixnum)) + (:info size) + (:results (res :scs (signed-reg))) + (:result-types fixnum) + (:ignore eax) + (:generator 1 + (inst movsx res + (make-random-tn :kind :normal + :sc (sc-or-lose (ecase size + (8 'byte-reg) + (16 'word-reg))) + :offset (tn-offset val))))) + +#-sb-xc-host +(defun sign-extend (x size) + (declare (type (signed-byte 32) x)) + (ecase size + (8 (sign-extend x size)) + (16 (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) (:policy :fast-safe) @@ -204,6 +252,21 @@ (:generator 2 (inst mov res (make-fixup foreign-symbol :foreign-dataref)))) +(defun force-x87-to-mem (tn fp-temp) + (aver (location= tn fr0-tn)) + (sc-case tn + (single-reg + (let ((ea (ea-for-sf-stack fp-temp))) + (inst fstp ea) + (inst fld ea))) + (double-reg + (let ((ea (ea-for-df-stack fp-temp))) + (inst fstpd ea) + (inst fldd ea))) + #!+long-float + (long-reg ; nothing to do! + ))) + (define-vop (call-out) (:args (function :scs (sap-reg)) (args :more t)) @@ -214,52 +277,55 @@ :from :eval :to :result) ecx) (:temporary (:sc unsigned-reg :offset edx-offset :from :eval :to :result) edx) - #!+darwin - (:temporary (:sc unsigned-reg :offset esi-offset) prev-esp) - (:node-var node) + (:temporary (:sc double-stack) fp-temp) + #!+sb-safepoint (:temporary (:sc unsigned-reg :offset esi-offset) esi) + #!+sb-safepoint (:temporary (:sc unsigned-reg :offset edi-offset) edi) + #!-sb-safepoint (:node-var node) (:vop-var vop) (:save-p t) - (:ignore args ecx edx) + (:ignore args ecx edx + #!+sb-safepoint esi + #!+sb-safepoint edi) (:generator 0 ;; FIXME & OAOOM: This is brittle and error-prone to maintain two ;; instances of the same logic, on in arch-assem.S, and one in ;; c-call.lisp. If you modify this, modify that one too... - (cond ((policy node (> space speed)) + (cond ((and + ;; On safepoints builds, we currently use the out-of-line + ;; calling routine irrespectively of SPACE and SPEED policy. + ;; An inline version of said changes is left to the + ;; sufficiently motivated maintainer. + #!-sb-safepoint (policy node (> space speed))) (move eax function) - (inst call (make-fixup "call_into_c" :foreign))) + (inst call (make-fixup "call_into_c" :foreign)) + (when (and results + (location= (tn-ref-tn results) fr0-tn)) + (force-x87-to-mem (tn-ref-tn results) fp-temp))) (t ;; Setup the NPX for C; all the FP registers need to be ;; empty; pop them all. (dotimes (i 8) (inst fstp fr0-tn)) - #!+win32 + ;; Clear out DF: Darwin, Windows, and Solaris at least require + ;; this, and it should not hurt others either. (inst cld) - #!+darwin - ;; Align stack for C. - (progn - (move prev-esp esp-tn) - (inst and esp-tn -16)) - (inst call function) - ;; To give the debugger a clue. XX not really internal-error? + ;; To give the debugger a clue. FIXME: not really internal-error? (note-this-location vop :internal-error) - #!+darwin - ;; Restore - (move esp-tn prev-esp) - ;; 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)) - ;; The return result is in fr0. - (inst fxch fr7-tn) ; move the result back to fr0 - (inst fldz)) ; insure no regs are empty - )))) + (cond ((and results + (location= (tn-ref-tn results) fr0-tn)) + ;; The return result is in fr0. + (inst fxch fr7-tn) ; move the result back to fr0 + (force-x87-to-mem (tn-ref-tn results) fp-temp)) + (t ; ensure no regs are empty + (inst fldz))))))) ;;; While SBCL uses the FPU in 53-bit mode, most C libraries assume that ;;; the FPU is in 64-bit mode. So we change the FPU mode to 64-bit with @@ -290,50 +356,36 @@ (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 esp-tn)) (unless (zerop amount) (let ((delta (logandc2 (+ amount 3) 3))) (inst sub esp-tn delta))) - ;; C stack should probably be 16 byte aligned on Darwin - #!+darwin (inst and esp-tn -16) + (align-stack-pointer esp-tn) (move result esp-tn))) -(define-vop (dealloc-number-stack-space) - (:info amount) - (:generator 0 - (unless (zerop amount) - (let ((delta (logandc2 (+ amount 3) 3))) - (inst add esp-tn delta))))) - (define-vop (alloc-alien-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 esp-tn))) (unless (zerop amount) (let ((delta (logandc2 (+ amount 3) 3))) - (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 :base temp) delta))) + (with-tls-ea (EA :base temp + :disp-type :index + :disp (make-ea-for-symbol-tls-index *alien-stack*)) + (inst sub EA delta :maybe-fs)))) (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))) + (inst sub (make-ea-for-symbol-value *alien-stack*) delta))) (load-symbol-value result *alien-stack*))) @@ -344,53 +396,35 @@ (:generator 0 (unless (zerop amount) (let ((delta (logandc2 (+ amount 3) 3))) - (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 add (make-ea :dword :base temp) delta)))) + (with-tls-ea (EA :base temp + :disp-type :index + :disp (make-ea-for-symbol-tls-index *alien-stack*)) + (inst add EA delta :maybe-fs))))) #!-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))) + (inst add (make-ea-for-symbol-value *alien-stack*) 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 29))) - (:info number) - (:policy :fast-safe) - (:generator 2 - (inst add esp-tn (fixnumize number)))) + (:arg-types t) + (:generator 0)) #-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) +(defun alien-callback-assembler-wrapper + (index return-type arg-types &optional (stack-offset 0)) "Cons up a piece of code which calls call-callback with INDEX and a pointer to the arguments." (declare (ignore arg-types)) @@ -411,17 +445,23 @@ pointer to the arguments." (inst push eax) ; arg1 (inst push (ash index 2)) ; arg0 - ;; 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 expecte anyone - ;; to rebind the variable. -- JES, 2006-01-01 - (inst mov eax (+ nil-value (static-symbol-offset - 'sb!alien::*enter-alien-callback*))) - (loadw eax eax symbol-value-slot other-pointer-lowtag) - (inst push eax) ; function - (inst mov eax (foreign-symbol-address "funcall3")) - (inst call eax) + #!+sb-safepoint + (progn + (inst mov eax (foreign-symbol-address "callback_wrapper_trampoline")) + (inst call eax)) + + #!-sb-safepoint + (progn + ;; 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 expecte anyone + ;; to rebind the variable. -- JES, 2006-01-01 + (load-symbol-value eax sb!alien::*enter-alien-callback*) + (inst push eax) ; function + (inst mov eax (foreign-symbol-address "funcall3")) + (inst call eax)) + ;; now put the result into the right register (cond ((and (alien-integer-type-p return-type) @@ -442,7 +482,7 @@ pointer to the arguments." (error "unrecognized alien type: ~A" return-type))) (inst mov esp ebp) ; discard frame (inst pop ebp) ; restore frame pointer - (inst ret)) + (inst ret stack-offset)) (finalize-segment segment) ;; Now that the segment is done, convert it to a static ;; vector we can point foreign code to.