(flushable movable))
(defknown deport (alien alien-type) t
(flushable movable))
-(defknown extract-alien-value (system-area-pointer unsigned-byte alien-type) t
+(defknown deport-alloc (alien alien-type) t
+ (flushable movable))
+(defknown %alien-value (system-area-pointer unsigned-byte alien-type) t
(flushable))
-(defknown deposit-alien-value (system-area-pointer unsigned-byte alien-type t) t
+(defknown (setf %alien-value) (t system-area-pointer unsigned-byte alien-type) t
())
(defknown alien-funcall (alien-value &rest *) *
(deftransform slot ((alien slot) * * :important t)
(multiple-value-bind (slot-offset slot-type)
(find-slot-offset-and-type alien slot)
- `(extract-alien-value (alien-sap alien)
- ,slot-offset
- ',slot-type)))
+ `(%alien-value (alien-sap alien)
+ ,slot-offset
+ ',slot-type)))
#+nil ;; ### But what about coercions?
(defoptimizer (%set-slot derive-type) ((alien slot value))
(deftransform %set-slot ((alien slot value) * * :important t)
(multiple-value-bind (slot-offset slot-type)
(find-slot-offset-and-type alien slot)
- `(deposit-alien-value (alien-sap alien)
- ,slot-offset
- ',slot-type
- value)))
+ `(setf (%alien-value (alien-sap alien)
+ ,slot-offset
+ ',slot-type)
+ value)))
(defoptimizer (%slot-addr derive-type) ((alien slot))
(block nil
(abort-ir1-transform "too many indices for pointer deref: ~W"
(length indices)))
(let ((element-type (alien-pointer-type-to alien-type)))
+ (unless element-type
+ (give-up-ir1-transform "unable to open code deref of wild pointer type"))
(if indices
(let ((bits (alien-type-bits element-type))
(alignment (alien-type-alignment element-type)))
(multiple-value-bind (indices-args offset-expr element-type)
(compute-deref-guts alien indices)
`(lambda (alien ,@indices-args)
- (extract-alien-value (alien-sap alien)
- ,offset-expr
- ',element-type))))
+ (%alien-value (alien-sap alien)
+ ,offset-expr
+ ',element-type))))
#+nil ;; ### Again, the value might be coerced.
(defoptimizer (%set-deref derive-type) ((alien value &rest noise))
(multiple-value-bind (indices-args offset-expr element-type)
(compute-deref-guts alien indices)
`(lambda (alien value ,@indices-args)
- (deposit-alien-value (alien-sap alien)
- ,offset-expr
- ',element-type
- value))))
+ (setf (%alien-value (alien-sap alien)
+ ,offset-expr
+ ',element-type)
+ value))))
(defoptimizer (%deref-addr derive-type) ((alien &rest noise))
(declare (ignore noise))
(return (make-alien-type-type type))))
*wild-type*))
-(deftransform %heap-alien ((info) * * :important t)
+(deftransform %heap-alien ((info) ((constant-arg heap-alien-info)) * :important t)
(multiple-value-bind (sap type) (heap-alien-sap-and-type info)
- `(extract-alien-value ,sap 0 ',type)))
+ `(%alien-value ,sap 0 ',type)))
#+nil ;; ### Again, deposit value might change the type.
(defoptimizer (%set-heap-alien derive-type) ((info value))
(deftransform %set-heap-alien ((info value) (heap-alien-info *) * :important t)
(multiple-value-bind (sap type) (heap-alien-sap-and-type info)
- `(deposit-alien-value ,sap 0 ',type value)))
+ `(setf (%alien-value ,sap 0 ',type) value)))
(defoptimizer (%heap-alien-addr derive-type) ((info))
(block nil
(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))))
+
\f
;;;; support for local (stack or register) aliens
-(deftransform make-local-alien ((info) * * :important t)
+(defun alien-info-constant-or-abort (info)
(unless (constant-lvar-p info)
- (abort-ir1-transform "Local alien info isn't constant?"))
+ (abort-ir1-transform "Local alien info isn't constant?")))
+
+(deftransform make-local-alien ((info) * * :important t)
+ (alien-info-constant-or-abort info)
(let* ((info (lvar-value info))
(alien-type (local-alien-info-type info))
(bits (alien-type-bits alien-type)))
(/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
- ;; could be factored into a function.
- (unless (constant-lvar-p info)
- (abort-ir1-transform "Local alien info isn't constant?"))
+ (alien-info-constant-or-abort info)
(let ((info (lvar-value info)))
(/noshow "in DEFTRANSFORM NOTE-LOCAL-ALIEN-TYPE" info)
(/noshow (local-alien-info-force-to-memory-p info))
nil)
(deftransform local-alien ((info var) * * :important t)
- (unless (constant-lvar-p info)
- (abort-ir1-transform "Local alien info isn't constant?"))
+ (alien-info-constant-or-abort info)
(let* ((info (lvar-value info))
(alien-type (local-alien-info-type info)))
(/noshow "in DEFTRANSFORM LOCAL-ALIEN" info alien-type)
(/noshow (local-alien-info-force-to-memory-p info))
(if (local-alien-info-force-to-memory-p info)
- `(extract-alien-value var 0 ',alien-type)
+ `(%alien-value var 0 ',alien-type)
`(naturalize var ',alien-type))))
(deftransform %local-alien-forced-to-memory-p ((info) * * :important t)
- (unless (constant-lvar-p info)
- (abort-ir1-transform "Local alien info isn't constant?"))
+ (alien-info-constant-or-abort info)
(let ((info (lvar-value info)))
(local-alien-info-force-to-memory-p info)))
(deftransform %set-local-alien ((info var value) * * :important t)
- (unless (constant-lvar-p info)
- (abort-ir1-transform "Local alien info isn't constant?"))
+ (alien-info-constant-or-abort info)
(let* ((info (lvar-value info))
(alien-type (local-alien-info-type info)))
(if (local-alien-info-force-to-memory-p info)
- `(deposit-alien-value var 0 ',alien-type value)
+ `(setf (%alien-value var 0 ',alien-type) value)
'(error "This should be eliminated as dead code."))))
(defoptimizer (%local-alien-addr derive-type) ((info var))
*wild-type*))
(deftransform %local-alien-addr ((info var) * * :important t)
- (unless (constant-lvar-p info)
- (abort-ir1-transform "Local alien info isn't constant?"))
+ (alien-info-constant-or-abort info)
(let* ((info (lvar-value info))
(alien-type (local-alien-info-type info)))
(/noshow "in DEFTRANSFORM %LOCAL-ALIEN-ADDR, creating %SAP-ALIEN")
(error "This shouldn't happen."))))
(deftransform dispose-local-alien ((info var) * * :important t)
- (unless (constant-lvar-p info)
- (abort-ir1-transform "Local alien info isn't constant?"))
+ (alien-info-constant-or-abort info)
(let* ((info (lvar-value info))
(alien-type (local-alien-info-type info)))
(if (local-alien-info-force-to-memory-p info)
(%computed-lambda #'compute-naturalize-lambda type))
(deftransform deport ((alien type) * * :important t)
(%computed-lambda #'compute-deport-lambda type))
- (deftransform extract-alien-value ((sap offset type) * * :important t)
+ (deftransform deport-alloc ((alien type) * * :important t)
+ (%computed-lambda #'compute-deport-alloc-lambda type))
+ (deftransform %alien-value ((sap offset type) * * :important t)
(%computed-lambda #'compute-extract-lambda type))
- (deftransform deposit-alien-value ((sap offset type value) * * :important t)
+ (deftransform (setf %alien-value) ((value sap offset type) * * :important t)
(%computed-lambda #'compute-deposit-lambda type)))
\f
;;;; a hack to clean up divisions
(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)))
(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)))
`(lambda (function ,@names)
(alien-funcall (deref function) ,@names))))
-(deftransform alien-funcall ((function &rest args) * * :important t)
+(deftransform alien-funcall ((function &rest args) * * :node node :important t)
(let ((type (lvar-type function)))
(unless (alien-type-type-p type)
(give-up-ir1-transform "can't tell function type at compile time"))
(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))
`(multiple-value-bind ,(temps) ,body
(values ,@(results)))))
(setf body `(naturalize ,body ',return-type)))
+ ;; Remember this frame to make sure that we can get back
+ ;; to it later regardless of how the foreign stack looks
+ ;; like.
+ #!+:c-stack-is-control-stack
+ (when (policy node (= 3 alien-funcall-saves-fp-and-pc))
+ (setf body `(invoke-with-saved-fp-and-pc (lambda () ,body))))
(/noshow "returning from DEFTRANSFORM ALIEN-FUNCALL" (params) body)
`(lambda (function ,@(params))
+ (declare (optimize (let-conversion 3)))
,body)))))))
(defoptimizer (%alien-funcall derive-type) ((function type &rest args))
(error "Something is broken."))
(values-specifier-type
(compute-alien-rep-type
- (alien-fun-type-result-type type)))))
+ (alien-fun-type-result-type type)
+ :result))))
(defoptimizer (%alien-funcall ltn-annotate)
((function type &rest args) node ltn-policy)
(error "Something is broken.")))
(lvar (node-lvar call))
(args args)
- #!+(or (and x86 darwin) 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)
- #!+(or (and x86 darwin) 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
(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
((lvar-tn call block function)
(reference-tn-list arg-tns nil))
((reference-tn-list result-tns t))))
- #!-(or (and darwin x86) win32) (vop dealloc-number-stack-space call block stack-frame-size)
- #!+(or (and darwin x86) 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))))
projects / sbcl.git / blobdiff