(flushable movable))
(defknown deport-alloc (alien alien-type) t
(flushable movable))
-(defknown extract-alien-value (system-area-pointer unsigned-byte alien-type) t
+(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
(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
\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)))
(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-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)
+ (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
`(lambda (function ,@names)
(alien-funcall (deref function) ,@names))))
-;;; Frame pointer, program counter conses. In each thread it's bound
-;;; locally or not bound at all.
-(defvar *saved-fp-and-pcs*)
-
-#!+:c-stack-is-control-stack
-(declaim (inline invoke-with-saved-fp-and-pc))
-#!+:c-stack-is-control-stack
-(defun invoke-with-saved-fp-and-pc (fn)
- (declare #-sb-xc-host (muffle-conditions compiler-note)
- (optimize (speed 3)))
- (let* ((fp-and-pc (cons (%caller-frame)
- (sap-int (%caller-pc)))))
- (declare (truly-dynamic-extent fp-and-pc))
- (let ((*saved-fp-and-pcs* (if (boundp '*saved-fp-and-pcs*)
- (cons fp-and-pc *saved-fp-and-pcs*)
- (list fp-and-pc))))
- (declare (truly-dynamic-extent *saved-fp-and-pcs*))
- (funcall fn))))
-
-(defun find-saved-fp-and-pc (fp)
- (when (boundp '*saved-fp-and-pcs*)
- (dolist (x *saved-fp-and-pcs*)
- (when (#!+:stack-grows-downward-not-upward
- sap>
- #!-:stack-grows-downward-not-upward
- sap<
- (int-sap (get-lisp-obj-address (car x))) fp)
- (return (values (car x) (cdr x)))))))
-
(deftransform alien-funcall ((function &rest args) * * :node node :important t)
(let ((type (lvar-type function)))
(unless (alien-type-type-p type)
;; to it later regardless of how the foreign stack looks
;; like.
#!+:c-stack-is-control-stack
- (when (policy node (<= speed debug))
+ (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))
projects / sbcl.git / blobdiff