Changeset 5959

Timestamp:

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

Author:

Gary Byers

Message:

Some extra fields in objc-message-info/objc-method-info structures.

When calculating overall alignment of a structure, treat bitfields
as if they were :unsigned-int (since there's a "containing" unsigned
int that affects alignment. N.B: this should be imposed for anything that
has an alignment of 1, not just a size of 1.)

When loading integer types, try to use the precomputed types rather
than consing a new one. This (a) reduces consing a little (b) is
more likely to get the alignment correct. For (b), we really need
to distinguish between bitfields and addressable integers.

File:

• trunk/ccl/lib/db-io.lisp (modified) (5 diffs)

trunk/ccl/lib/db-io.lisp

@@ -828 +828 @@
                                        nil))))))
 
-;;; For backward compatibility: the implementation really shouldn't define
-;;; #?.  Nuke this in a future release.
-;;; Now, for instance.
-#+no
-(set-dispatch-macro-character #\# #\? (get-dispatch-macro-character #\# #\&))
+
               
 
@@ -841 +837 @@
   req-args
   flags
-  protocol-methods)
-
+  protocol-methods
+  lisp-name
+  selector)
+
+
+
+   
 (defstruct objc-method-info
   message-info
@@ -851 +852 @@
   flags
   signature
+  signature-info
   )
 
@@ -1509 +1511 @@
       (#.encoded-type-signed-16 (values (svref *signed-integer-types* 16) q))
       (#.encoded-type-unsigned-16 (values (svref *unsigned-integer-types* 16) q))
-      (#.encoded-type-signed-n (values (make-foreign-integer-type
-                                          :signed t
-                                          :bits (%get-unsigned-byte buf q))
+      (#.encoded-type-signed-n (values (let* ((bits (%get-unsigned-byte buf q)))
+                                         (if (<= bits 32)
+                                           (svref *signed-integer-types* bits)
+                                           (make-foreign-integer-type
+                                            :signed t
+                                            :bits bits)))
                                          (1+ q)))
-      (#.encoded-type-unsigned-n (values (make-foreign-integer-type
+      (#.encoded-type-unsigned-n (values (let* ((bits (%get-unsigned-byte buf q)))
+                                         (if (<= bits 32)
+                                           (svref *unsigned-integer-types* bits)
+                                           (make-foreign-integer-type
                                             :signed nil
-                                            :bits (%get-unsigned-byte buf q))
+                                            :bits bits)))
                                            (1+ q)))
       (#.encoded-type-single-float (values (parse-foreign-type :float) q))
@@ -1638 +1646 @@
           (error "Unknown alignment: ~S"
                  (unparse-foreign-type field-type)))
-        (setq overall-alignment (max overall-alignment alignment))
+        (setq overall-alignment (max overall-alignment (if (= alignment 1) 32 alignment)))
         (ecase kind
           (:struct (let* ((imported-offset (foreign-record-field-offset field))