0.8.12.10: Fix bug 338: "MOP specializers as type specifiers"

[sbcl.git] / contrib / sb-posix / macros.lisp

diff --git a/contrib/sb-posix/macros.lisp b/contrib/sb-posix/macros.lisp
index 959843b..248db20 100644 (file)
--- 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)))
@@ -31,34 +32,53 @@
   (string filename))
 
 (define-designator file-descriptor (integer 32)
-  (sb-impl::file-stream (sb-impl::fd-stream-fd file-descriptor))
+  (file-stream (sb-sys:fd-stream-fd file-descriptor))
   (fixnum file-descriptor))
 
 (define-designator sap-or-nil sb-sys:system-area-pointer
   (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)))
     `(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 ,(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))))))
+      (defun ,lisp-name ,arglist
+       ,@body))))