X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Faliencomp.lisp;h=3635cb4c16437a247eca371451bb0180502a816d;hb=07ab1e4811ab16f95a9a5e8d767426a0787f22c0;hp=3299c2108a75e0b015f20f2b7dc24688432c9bf2;hpb=fe5d3fcb66a417311359101a77da4a691e649622;p=sbcl.git diff --git a/src/compiler/aliencomp.lisp b/src/compiler/aliencomp.lisp index 3299c21..3635cb4 100644 --- a/src/compiler/aliencomp.lisp +++ b/src/compiler/aliencomp.lisp @@ -332,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 @@ -348,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 @@ -525,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))) @@ -582,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))) @@ -612,6 +613,33 @@ `(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) + (let* ((fp-and-pc (multiple-value-bind (fp pc) + (%caller-frame-and-pc) + (cons fp pc))) + (*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 fp-and-pc *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) * * :important t) (let ((type (lvar-type function))) (unless (alien-type-type-p type) @@ -666,6 +694,11 @@ `(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 + (setf body `(invoke-with-saved-fp-and-pc (lambda () ,body))) (/noshow "returning from DEFTRANSFORM ALIEN-FUNCALL" (params) body) `(lambda (function ,@(params)) ,body))))))) @@ -700,11 +733,14 @@ (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 @@ -722,22 +758,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 @@ -759,7 +795,10 @@ ((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))))