Changeset 14929

Timestamp:

Aug 4, 2011, 2:53:54 PM (13 years ago)

Author:

Bill St. Clair

Message:

open-shared-library works again in FreeBSD

File:

• trunk/source/level-0/l0-cfm-support.lisp (modified) (5 diffs)

trunk/source/level-0/l0-cfm-support.lisp

@@ -162 +162 @@
 #+(or linux-target freebsd-target solaris-target)
 (progn
+
+;; (pref ptr :link_map.l_addr) is an integer on Linux and a Pointer on FreeBSD
+;; This macro returns a pointer on all platforms
+(defmacro link_map.l_addr (ptr)
+  (let* ((record (%find-foreign-record :link_map))
+         (field (%find-foreign-record-type-field record :l_addr))
+         (offset (/ (foreign-record-field-offset field) 8)))
+    `(%get-ptr ,ptr ,offset)))
 
 (defun soname-ptr-from-link-map (map)
@@ -241 +249 @@
 
 (defun shlib-from-map-entry (m)
-  (let* ((base (%int-to-ptr (pref m :link_map.l_addr))))
+  (let* ((base (link_map.l_addr m)))
     ;; On relatively modern Linux systems, this is often NULL.
     ;; I'm not sure what (SELinux ?  Pre-binding ?  Something else ?)
@@ -351 +359 @@
         (%walk-shared-libraries
          #'(lambda (map)
-             (let* ((addr (pref map :link_map.l_addr)))
-               (unless (or (eql addr 0)
-                           (shared-library-at (%int-to-ptr addr)))
+             (let* ((addr (link_map.l_addr map)))
+               (unless (or (%null-ptr-p addr)
+                           (shared-library-at addr))
                  (let* ((new (shlib-from-map-entry map)))
                    (%dlopen-shlib new))))))))))
@@ -856 +864 @@
                        :unsigned-fullword *dlopen-flags*
                        :void)
-              (setf (shlib.base lib) (%int-to-ptr (pref map :link_map.l_addr))
+              (setf (shlib.base lib) (link_map.l_addr map)
                     (shlib.pathname lib) (%get-cstring
                                           (pref map :link_map.l_name))
@@ -900 +908 @@
                         (%get-cstring (pref map :link_map.l_name))
                         (shlib.base lib)
-                        (%int-to-ptr (pref map :link_map.l_addr))
+                        (link_map.l_addr map)
                         (shlib.map lib) map
                         (shlib.handle lib) handle