Changeset 5523

Timestamp:

Nov 8, 2006, 11:38:13 AM (18 years ago)

Author:

Gary Byers

Message:

parse-foreign-record-fields: conformance to poweropen structure layout
rules should be an attribute of the FTD, not done via read-time
conditionalization.

File:

• trunk/ccl/lib/foreign-types.lisp (modified) (2 diffs)

trunk/ccl/lib/foreign-types.lisp

@@ -981 +981 @@
   (declare (type foreign-record-type result)
            (type list fields))
-  (let ((total-bits 0)
-        (overall-alignment 1)
-        (parsed-fields nil)
-        #+poweropen-target
-        (first-field-p t)
-        (alt-alignment (foreign-record-type-alt-align result)))
+  (let* ((total-bits 0)
+         (overall-alignment 1)
+         (parsed-fields nil)
+         (first-field-p t)
+         (alt-alignment (foreign-record-type-alt-align result))
+         (attributes (ftd-attributes *target-ftd*))
+         (poweropen-alignment (getf attributes :poweropen-alignment)))
+          
     (dolist (field fields)
       (destructuring-bind (var type &optional bits) field
@@ -995 +997 @@
                (alignment (if alt-alignment
                             (min natural-alignment alt-alignment)
-                            #+poweropen-target
-                            (if first-field-p
-                              (progn
-                                (setq first-field-p nil)
-                                natural-alignment)
-                              (min 32 natural-alignment))
-                            #-poweropen-target
-                            natural-alignment))
+                            (if poweropen-alignment
+                              (if first-field-p
+                                (progn
+                                  (setq first-field-p nil)
+                                  natural-alignment)
+                                (min 32 natural-alignment))
+                              natural-alignment)))
                (parsed-field
                 (make-foreign-record-field :type field-type