X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Faliencomp.lisp;h=eff524df5ad6ac07637c2f270cb31060c54f9e06;hb=0c8643845555805048f50c783e118762e2c43a26;hp=33afd27e6d48f77e7ccead2bc5db3fb84e0c4ed0;hpb=02a50d510572990c2b836e37ec1c0b23dac41b1a;p=sbcl.git diff --git a/src/compiler/aliencomp.lisp b/src/compiler/aliencomp.lisp index 33afd27..eff524d 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 @@ -330,7 +332,8 @@ (deftransform %heap-alien-addr ((info) * * :important t) (multiple-value-bind (sap type) (heap-alien-sap-and-type info) (/noshow "in DEFTRANSFORM %HEAP-ALIEN-ADDR, creating %SAP-ALIEN") - `(%sap-alien ,sap ',type))) + `(%sap-alien ,sap ',(make-alien-pointer-type :to type)))) + ;;;; support for local (stack or register) aliens @@ -346,26 +349,26 @@ (/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))) - (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) - alien-rep-type) - '(int-sap 0)) - ((ctypep 0 alien-rep-type) 0) - ((ctypep 0.0f0 alien-rep-type) 0.0f0) - ((ctypep 0.0d0 alien-rep-type) 0.0d0) - (t - (compiler-error - "Aliens of type ~S cannot be represented immediately." - (unparse-alien-type alien-type)))))))) + #!+(or x86 x86-64) + `(%primitive alloc-alien-stack-space + ,(ceiling (alien-type-bits alien-type) + sb!vm:n-byte-bits)) + #!-(or x86 x86-64) + `(%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) + alien-rep-type) + '(int-sap 0)) + ((ctypep 0 alien-rep-type) 0) + ((ctypep 0.0f0 alien-rep-type) 0.0f0) + ((ctypep 0.0d0 alien-rep-type) 0.0d0) + (t + (compiler-error + "Aliens of type ~S cannot be represented immediately." + (unparse-alien-type alien-type)))))))) (deftransform note-local-alien-type ((info var) * * :important t) ;; FIXME: This test and error occur about a zillion times. They @@ -469,7 +472,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 +509,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) @@ -521,7 +526,7 @@ (count-low-order-zeros (lvar-uses thing)))) (combination (case (let ((name (lvar-fun-name (combination-fun thing)))) - (or (modular-version-info name :unsigned) name)) + (or (modular-version-info name :untagged nil) name)) ((+ -) (let ((min most-positive-fixnum) (itype (specifier-type 'integer))) @@ -578,7 +583,7 @@ (give-up-ir1-transform)) (let ((inside-fun-name (lvar-fun-name (combination-fun value-node)))) (multiple-value-bind (prototype width) - (modular-version-info inside-fun-name :unsigned) + (modular-version-info inside-fun-name :untagged nil) (unless (eq (or prototype inside-fun-name) 'ash) (give-up-ir1-transform)) (when (and width (not (constant-lvar-p amount))) @@ -590,7 +595,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 +632,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 +701,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,22 +726,22 @@ (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)) + (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 @@ -734,7 +763,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))))