X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-posix%2Fmacros.lisp;h=248db203491fb80794d0b8458d7ec9310d7cc4a8;hb=c2dc8ac5336601717af4e7bb09a67c19758181e0;hp=b35a31fa3ebc7c55986e547e13ee64baaefde945;hpb=8b77810a9c727bb6026e575f38a176a39e7675b4;p=sbcl.git

diff --git a/contrib/sb-posix/macros.lisp b/contrib/sb-posix/macros.lisp
index b35a31f..248db20 100644
--- a/contrib/sb-posix/macros.lisp
+++ b/contrib/sb-posix/macros.lisp
@@ -17,7 +17,8 @@
 	   (write-char #\/ s))
 	 (dolist (piece (cdr directory))
 	   (etypecase piece
-	     (string (write-string piece s) (write-char #\/ s))))))
+	     (string (write-string piece s) (write-char #\/ s))
+	     ((member :up) (write-string "../" s))))))
       (etypecase name
 	(null)
         (string (write-string name s)))
@@ -38,32 +39,46 @@
   (null (sb-sys:int-sap 0))
   (sb-sys:system-area-pointer sap-or-nil))
 
+(define-designator alien-pointer-to-anything-or-nil (* t)
+  (null (sb-alien:sap-alien (sb-sys:int-sap 0) (* t)))
+  ((alien (* t)) alien-pointer-to-anything-or-nil))
+
 (defun lisp-for-c-symbol (s)
   (intern (substitute #\- #\_ (string-upcase s)) :sb-posix))
 
+(defmacro define-call-internally (lisp-name c-name return-type error-predicate &rest arguments)
+  (if (sb-fasl::foreign-symbol-address-as-integer-or-nil
+       (sb-vm:extern-alien-name c-name))
+      `(progn
+	(declaim (inline ,lisp-name))
+	(defun ,lisp-name ,(mapcar #'car arguments)
+	  (let ((r (alien-funcall
+		    (extern-alien
+		     ,c-name
+		     (function ,return-type
+			       ,@(mapcar
+				  (lambda (x)
+				    (gethash (cadr x) *designator-types* (cadr x)))
+				  arguments)))
+		    ,@(mapcar (lambda (x)
+				(if (nth-value 1 (gethash (cadr x) *designator-types*))
+				    `(,(intern (symbol-name (cadr x)) :sb-posix)
+				      ,(car x))
+				    (car x)))
+			      arguments))))
+	    (if (,error-predicate r) (syscall-error) r))))
+      `(sb-int:style-warn "Didn't find definition for ~S" ,c-name)))
+
 (defmacro define-call (name return-type error-predicate &rest arguments)
   (let ((lisp-name (lisp-for-c-symbol name)))
-    (if (sb-fasl::foreign-symbol-address-as-integer-or-nil
-	 (sb-vm:extern-alien-name name))
-	`(progn
-	  (export ',lisp-name :sb-posix)
-	  (declaim (inline ,lisp-name))
-	  (defun ,lisp-name ,(mapcar #'car arguments)
-	    (let ((r (alien-funcall
-		      (extern-alien
-		       ,name
-		       (function ,return-type
-				 ,@(mapcar
-				    (lambda (x)
-				      (gethash (cadr x) *designator-types* (cadr x)))
-				    arguments)))
-		      ,@(mapcar (lambda (x)
-				  (if (nth-value 1 (gethash (cadr x) *designator-types*))
-				      `(,(intern (symbol-name (cadr x)) :sb-posix)
-					,(car x))
-				      (car x)))
-				arguments))))
-	      (if (,error-predicate r) (syscall-error) r))))
-	`(progn
-	  (export ',lisp-name :sb-posix)
-	  (sb-int:style-warn "Didn't find definition for ~S" ,name)))))
+    `(progn
+       (export ',lisp-name :sb-posix)
+       (define-call-internally ,lisp-name ,name ,return-type ,error-predicate ,@arguments))))
+
+(defmacro define-entry-point (name arglist &body body)
+  (let ((lisp-name (lisp-for-c-symbol name)))
+    `(progn
+      (export ',lisp-name :sb-posix)
+      (declaim (inline ,lisp-name))
+      (defun ,lisp-name ,arglist
+	,@body))))