X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-alieneval.lisp;h=a2e8324871f7a2d54b46ce75e4cefbffd8e8c76d;hb=67dc5cf478dfe5e3f517001febb9a8f7b922eacf;hp=a25d4b90f90f3668c27a408b6507a1def8682852;hpb=3f321528f3da20ce000bb5e0d42bf5e204b3e696;p=sbcl.git

diff --git a/src/code/target-alieneval.lisp b/src/code/target-alieneval.lisp
index a25d4b9..a2e8324 100644
--- a/src/code/target-alieneval.lisp
+++ b/src/code/target-alieneval.lisp
@@ -73,19 +73,20 @@
     (clear-info :variable :constant-value lisp-name)
     (setf (info :variable :alien-info lisp-name)
 	  (make-heap-alien-info :type type
-				:sap-form `(foreign-symbol-address
-					    ',alien-name)))))
+				:sap-form `(foreign-symbol-address ',alien-name t)))))
 
 (defmacro extern-alien (name type &environment env)
   #!+sb-doc
   "Access the alien variable named NAME, assuming it is of type TYPE. This
    is SETFable."
-  (let ((alien-name (etypecase name
-		      (symbol (guess-alien-name-from-lisp-name name))
-		      (string name))))
+  (let* ((alien-name (etypecase name
+		       (symbol (guess-alien-name-from-lisp-name name))
+		       (string name)))
+	 (alien-type (parse-alien-type type env))
+	 (datap (not (alien-fun-type-p alien-type))))
     `(%heap-alien ',(make-heap-alien-info
-		     :type (parse-alien-type type env)
-		     :sap-form `(foreign-symbol-address ',alien-name)))))
+		     :type alien-type
+		     :sap-form `(foreign-symbol-address ',alien-name ,datap)))))
 
 (defmacro with-alien (bindings &body body &environment env)
   #!+sb-doc
@@ -109,7 +110,8 @@
 	  (symbol type &optional (opt1 nil opt1p) (opt2 nil opt2p))
 	  binding
 	(/show symbol type opt1 opt2)
-	(let ((alien-type (parse-alien-type type env)))
+	(let* ((alien-type (parse-alien-type type env))
+	       (datap (not (alien-fun-type-p alien-type))))
 	  (/show alien-type)
 	  (multiple-value-bind (allocation initial-value)
 	      (if opt2p
@@ -141,7 +143,8 @@
 		     (let ((info (make-heap-alien-info
 				  :type alien-type
 				  :sap-form `(foreign-symbol-address
-					      ',initial-value))))
+					      ',initial-value
+					      ,datap))))
 		       `((symbol-macrolet
 			  ((,symbol (%heap-alien ',info)))
 			  ,@body))))