Changeset 5960

Timestamp:

Feb 23, 2007, 9:13:23 AM (18 years ago)

Author:

Gary Byers

Message:

Changes to GUESS-ALIGNMENT. Again, this only makes sense for cases
where we have to guess; a bitfield that's 8 bits wide still has an
alignment of 1.

Factor in the alignment of the containing int when bitfields are
involved.

When parsing a record type, set the "bits" slot of each field.
(Not too many things look at that slot, but we want the effect
of loading a record from the database to match the effect of
parsing a definition as exactly as possible, and to be able to
use EQUALP to compare the results.)

File:

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

trunk/ccl/lib/foreign-types.lisp

@@ -156 +156 @@
           ((> bits 16) 32)
           ((> bits 8) 16)
-          ((> bits 1) 8)
+          ((= bits 8) 8)
           (t 1)))
 
@@ -1039 +1039 @@
             (error "Unknown alignment: ~S"
                    (unparse-foreign-type field-type)))
-          (setf overall-alignment (max overall-alignment alignment))
+          (setf overall-alignment (max overall-alignment (if (< alignment 8) 32 alignment)))
           (ecase (foreign-record-type-kind result)
             (:struct
              (let ((offset (align-offset total-bits alignment)))
                (setf (foreign-record-field-offset parsed-field) offset)
+               (setf (foreign-record-field-bits parsed-field) bits)
                (setf total-bits (+ offset bits))))
             (:union
@@ -1585 +1586 @@
   (let* ((*target-ftd* ftd)
          (natural-word-size (getf (ftd-attributes ftd) :bits-per-word)))
-    
     (def-foreign-type-translator signed (&optional (bits 32))
       (if (<= bits 32)