Changeset 11555

Timestamp:

Dec 27, 2008, 3:57:47 AM (11 years ago)

Author:

rme

Message:

Small structs returned in registers by the Cygwin compiler, too. This
is apparently what the MS compilers do, as well.

File:

• trunk/source/lib/ffi-win32.lisp (modified) (1 diff)

trunk/source/lib/ffi-win32.lisp

@@ -1 +1 @@
 (in-package "CCL")
 
+;;; Cygwin compiler returns small structures in registers
+;;; (just like on Darwin, apparently).
 (defun win32::record-type-returns-structure-as-first-arg (rtype)
-  (x8632::record-type-returns-structure-as-first-arg rtype))
+  (when (and rtype
+             (not (typep rtype 'unsigned-byte))
+             (not (member rtype *foreign-representation-type-keywords*
+                          :test #'eq)))
+    (let* ((ftype (if (typep rtype 'foreign-type)
+                    rtype
+                    (parse-foreign-type rtype)))
+           (nbits (ensure-foreign-type-bits ftype)))
+      (not (member nbits '(8 16 32 64))))))
 
 (defun win32::expand-ff-call (callform args &key (arg-coerce #'null-coerce-foreign-arg) (result-coerce #'null-coerce-foreign-result))