Changeset 6054 for branches

Timestamp:

Mar 17, 2007, 6:31:27 PM (18 years ago)

Author:

Gary Byers

Message:

Define a few foreign structures inside INSTALL-STANDARD-FOREIGN-TYPES
(again); do so via PARSE-FOREIGN-TYPE, since this runs too early for
DEF-FOREIGN-TYPE to have the intended effect.

Transator for :* : don't force the target type to be fully defined.

File:

• branches/objc-gf/ccl/lib/foreign-types.lisp (modified) (2 diffs)

branches/objc-gf/ccl/lib/foreign-types.lisp

@@ -1748 +1748 @@
 
     (def-foreign-type-translator * (to)
-      (let* ((to (if (eq to t) *void-foreign-type* (parse-foreign-type to))))
-        (ensure-foreign-type-bits to)
-        (or (gethash to (ftd-pointer-types *target-ftd*))
+      (let* ((ftd *target-ftd*)
+             (to (if (eq to t) *void-foreign-type* (parse-foreign-type to ftd))))
+        (or (gethash to (ftd-pointer-types ftd))
             (setf (gethash to (ftd-pointer-types *target-ftd*))
                   (make-foreign-pointer-type
@@ -1791 +1791 @@
       (%def-foreign-type :signed-long signed-long-type ftd)
       (%def-foreign-type :unsigned-long unsigned-long-type ftd))
-    ))
-
-
-
-
-
-
+    ;;
+    ;; Defining the handful of foreign structures that are used
+    ;; to build OpenMCL here ensures that all backends see appropriate
+    ;; definitions of them.
+    ;;
+    ;; Don't use DEF-FOREIGN-TYPE here; this often runs too
+    ;; early in the cold load for that to work.
+    ;;
+    (parse-foreign-type
+     '(:struct :cdb-datum
+       (:data (* t))
+       (:size (:unsigned 32)))
+     ftd)
+    (parse-foreign-type
+     '(:struct :dbm-constant
+       (:class (:unsigned 32))
+       (:pad (:unsigned 32))
+       (:value
+        (:union nil
+         (:s32 (:signed 32))
+         (:u32 (:unsigned 32))
+         (:single-float :float)
+         (:double-float :double))))
+     ftd)
+    ;; This matches the xframe-list struct definition in
+    ;; "ccl:lisp-kernel;constants.h"
+    (parse-foreign-type
+     '(:struct :xframe-list
+       (:this (:* t #|(struct :ucontext)|#))
+       (:prev (:* (:struct  :xframe-list))))
+    ftd)
+  ))
+
+
+
+
+
+