X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Faliencomp.lisp;h=7cd63584c60ba68a95df7bfba1a834f44d9b7687;hb=1ff144d7d26762232b29b4c7cfeb0f0ad701c995;hp=7b19ac5ff8334a92c6d8fddeb40e6bc7176603c8;hpb=471a5d32673a4c0db86949424d624e6ea3a6a633;p=sbcl.git diff --git a/src/compiler/aliencomp.lisp b/src/compiler/aliencomp.lisp index 7b19ac5..7cd6358 100644 --- a/src/compiler/aliencomp.lisp +++ b/src/compiler/aliencomp.lisp @@ -61,6 +61,8 @@ (flushable movable)) (defknown deport (alien alien-type) t (flushable movable)) +(defknown deport-alloc (alien alien-type) t + (flushable movable)) (defknown extract-alien-value (system-area-pointer unsigned-byte alien-type) t (flushable)) (defknown deposit-alien-value (system-area-pointer unsigned-byte alien-type t) t @@ -346,14 +348,16 @@ (/noshow (local-alien-info-force-to-memory-p info)) (/noshow alien-type (unparse-alien-type alien-type) (alien-type-bits alien-type)) (if (local-alien-info-force-to-memory-p info) - #!+(or x86 x86-64) `(truly-the system-area-pointer - (%primitive alloc-alien-stack-space - ,(ceiling (alien-type-bits alien-type) - sb!vm:n-byte-bits))) - #!-(or x86 x86-64) `(truly-the system-area-pointer - (%primitive alloc-number-stack-space - ,(ceiling (alien-type-bits alien-type) - sb!vm:n-byte-bits))) + #!+(or x86 x86-64) + `(truly-the system-area-pointer + (%primitive alloc-alien-stack-space + ,(ceiling (alien-type-bits alien-type) + sb!vm:n-byte-bits))) + #!-(or x86 x86-64) + `(truly-the system-area-pointer + (%primitive alloc-number-stack-space + ,(ceiling (alien-type-bits alien-type) + sb!vm:n-byte-bits))) (let* ((alien-rep-type-spec (compute-alien-rep-type alien-type)) (alien-rep-type (specifier-type alien-rep-type-spec))) (cond ((csubtypep (specifier-type 'system-area-pointer) @@ -469,7 +473,7 @@ (let ((alien-node (lvar-uses alien))) (typecase alien-node (combination - (extract-fun-args alien '%sap-alien 2) + (splice-fun-args alien '%sap-alien 2) '(lambda (sap type) (declare (ignore type)) sap)) @@ -506,6 +510,8 @@ (%computed-lambda #'compute-naturalize-lambda type)) (deftransform deport ((alien type) * * :important t) (%computed-lambda #'compute-deport-lambda type)) + (deftransform deport-alloc ((alien type) * * :important t) + (%computed-lambda #'compute-deport-alloc-lambda type)) (deftransform extract-alien-value ((sap offset type) * * :important t) (%computed-lambda #'compute-extract-lambda type)) (deftransform deposit-alien-value ((sap offset type value) * * :important t) @@ -590,7 +596,7 @@ (unless (and (constant-lvar-p inside-amount) (not (minusp (lvar-value inside-amount)))) (give-up-ir1-transform))) - (extract-fun-args value inside-fun-name 2) + (splice-fun-args value inside-fun-name 2) (if width `(lambda (value amount1 amount2) (logand (ash value (+ amount1 amount2)) @@ -627,10 +633,31 @@ (let ((param (gensym))) (params param) (deports `(deport ,param ',arg-type)))) + ;; Build BODY from the inside out. (let ((return-type (alien-fun-type-result-type alien-type)) + ;; Innermost, we DEPORT the parameters (e.g. by taking SAPs + ;; to them) and do the call. (body `(%alien-funcall (deport function ',alien-type) ',alien-type ,@(deports)))) + ;; Wrap that in a WITH-PINNED-OBJECTS to ensure the values + ;; the SAPs are taken for won't be moved by the GC. (If + ;; needed: some alien types won't need it). + (setf body `(maybe-with-pinned-objects ,(params) ,arg-types + ,body)) + ;; Around that handle any memory allocation that's needed. + ;; Mostly the DEPORT-ALLOC alien-type-methods are just an + ;; identity operation, but for example for deporting a + ;; Unicode string we need to convert the string into an + ;; octet array. This step needs to be done before the pinning + ;; to ensure we pin the right objects, so it can't be combined + ;; with the deporting. + ;; -- JES 2006-03-16 + (loop for param in (params) + for arg-type in arg-types + do (setf body + `(let ((,param (deport-alloc ,param ',arg-type))) + ,body))) (if (alien-values-type-p return-type) (collect ((temps) (results)) (dolist (type (alien-values-type-values return-type)) @@ -675,11 +702,14 @@ (error "Something is broken."))) (lvar (node-lvar call)) (args args) - #!+win32 (stack-pointer (make-stack-pointer-tn))) + #!+x86 + (stack-pointer (make-stack-pointer-tn))) (multiple-value-bind (nsp stack-frame-size arg-tns result-tns) (make-call-out-tns type) - #!+x86 (vop set-fpu-word-for-c call block) - #!+win32 (vop current-stack-pointer call block stack-pointer) + #!+x86 + (progn + (vop set-fpu-word-for-c call block) + (vop current-stack-pointer call block stack-pointer)) (vop alloc-number-stack-space call block stack-frame-size nsp) (dolist (tn arg-tns) ;; On PPC, TN might be a list. This is used to indicate @@ -697,23 +727,23 @@ (unless (= (length move-arg-vops) 1) (error "no unique move-arg-vop for moves in SC ~S" (sc-name sc))) #!+(or x86 x86-64) (emit-move-arg-template call - block - (first move-arg-vops) - (lvar-tn call block arg) - nsp - first-tn) + block + (first move-arg-vops) + (lvar-tn call block arg) + nsp + first-tn) #!-(or x86 x86-64) (progn - (emit-move call - block - (lvar-tn call block arg) - temp-tn) - (emit-move-arg-template call - block - (first move-arg-vops) - temp-tn - nsp - first-tn)) - #+(and ppc darwin) + (emit-move call + block + (lvar-tn call block arg) + temp-tn) + (emit-move-arg-template call + block + (first move-arg-vops) + temp-tn + nsp + first-tn)) + #!+(and ppc darwin) (when (listp tn) ;; This means that we have a float arg that we need to ;; also copy to some int regs. The list contains the TN @@ -734,7 +764,10 @@ ((lvar-tn call block function) (reference-tn-list arg-tns nil)) ((reference-tn-list result-tns t)))) - #!-win32 (vop dealloc-number-stack-space call block stack-frame-size) - #!+win32 (vop reset-stack-pointer call block stack-pointer) - #!+x86 (vop set-fpu-word-for-lisp call block) + #!-x86 + (vop dealloc-number-stack-space call block stack-frame-size) + #!+x86 + (progn + (vop reset-stack-pointer call block stack-pointer) + (vop set-fpu-word-for-lisp call block)) (move-lvar-result call block result-tns lvar))))