Work at SourceForge, help us to make it a better place! We have an immediate need for a Support Technician in our San Francisco or Denver office.

Close

Diff of /src/runtime/os-common.c [3ea89b] .. [f05756] Maximize Restore

  Switch to side-by-side view

--- a/src/runtime/os-common.c
+++ b/src/runtime/os-common.c
@@ -14,8 +14,23 @@
 #include <string.h>
 
 #include "sbcl.h"
+#include "globals.h"
+#include "runtime.h"
+#include "genesis/config.h"
+#include "genesis/constants.h"
+#include "genesis/cons.h"
+#include "genesis/vector.h"
+#include "genesis/symbol.h"
+#include "genesis/static-symbols.h"
+#include "thread.h"
+#include "sbcl.h"
 #include "os.h"
 #include "interr.h"
+#if defined(LISP_FEATURE_OS_PROVIDES_DLOPEN) && !defined(LISP_FEATURE_WIN32)
+# define __USE_GNU /* needed for RTLD_DEFAULT */
+# include <dlfcn.h>
+#endif
+
 
 /* Except for os_zero, these routines are only called by Lisp code.
  * These routines may also be replaced by os-dependent versions
@@ -111,3 +126,111 @@
 }
 
 #endif
+
+#if defined(LISP_FEATURE_OS_PROVIDES_DLOPEN) && !defined(LISP_FEATURE_WIN32)
+void* os_dlopen(char* name, int flags) {
+    volatile void* ret = dlopen(name,flags);
+    return ret;
+}
+#endif
+
+#if defined(LISP_FEATURE_SB_DYNAMIC_CORE)
+/* When this feature is enabled, the special category of /static/ foreign
+ * symbols disappears. Foreign fixups are resolved to linkage table locations
+ * during genesis, and for each of them a record is added to
+ * REQUIRED_RUNTIME_C_SYMBOLS list, of the form (cons name datap).
+ *
+ * Name is a base-string of a symbol name, and non-nil datap marks data
+ * references.
+ *
+ * Before any code in lisp image can be called, we have to resolve all
+ * references to runtime foreign symbols that used to be static, adding linkage
+ * table entry for each element of REQUIRED_RUNTIME_C_SYMBOLS.
+ */
+
+/* We start with a little greenspunning to make car, cdr and base-string data
+ * accessible. */
+
+/* Object tagged? (dereference (cast (untag (obj)))) */
+#define FOLLOW(obj,lowtagtype,ctype)            \
+    (*(struct ctype*)(obj - lowtagtype##_LOWTAG))
+
+/* For all types sharing OTHER_POINTER_LOWTAG: */
+#define FOTHERPTR(obj,ctype)                    \
+    FOLLOW(obj,OTHER_POINTER,ctype)
+
+static inline lispobj car(lispobj conscell)
+{
+    return FOLLOW(conscell,LIST_POINTER,cons).car;
+}
+
+static inline lispobj cdr(lispobj conscell)
+{
+    return FOLLOW(conscell,LIST_POINTER,cons).cdr;
+}
+
+extern void undefined_alien_function(); /* see interrupt.c */
+
+#ifndef LISP_FEATURE_WIN32
+void *
+os_dlsym_default(char *name)
+{
+    void *frob = dlsym(RTLD_DEFAULT, name);
+    odxprint(misc, "%p", frob);
+    return frob;
+}
+#endif
+
+void os_link_runtime()
+{
+    lispobj head;
+    void *link_target = (void*)(intptr_t)LINKAGE_TABLE_SPACE_START;
+    void *validated_end = link_target;
+    lispobj symbol_name;
+    char *namechars;
+    boolean datap;
+    void* result;
+    int strict /* If in a cold core, fail early and often. */
+      = (SymbolValue(GC_INHIBIT, 0) & WIDETAG_MASK) == UNBOUND_MARKER_WIDETAG;
+    int n = 0, m = 0;
+
+    for (head = SymbolValue(REQUIRED_RUNTIME_C_SYMBOLS,0);
+         head!=NIL; head = cdr(head), n++)
+    {
+        lispobj item = car(head);
+        symbol_name = car(item);
+        datap = (NIL!=(cdr(item)));
+        namechars = (void*)(intptr_t)FOTHERPTR(symbol_name,vector).data;
+        result = os_dlsym_default(namechars);
+        odxprint(runtime_link, "linking %s => %p", namechars, result);
+
+        if (link_target == validated_end) {
+            validated_end += os_vm_page_size;
+#ifdef LISP_FEATURE_WIN32
+            os_validate_recommit(link_target,os_vm_page_size);
+#endif
+        }
+        if (result) {
+            if (datap)
+                arch_write_linkage_table_ref(link_target,result);
+            else
+                arch_write_linkage_table_jmp(link_target,result);
+        } else {
+            m++;
+            if (strict)
+                fprintf(stderr,
+                        "undefined foreign symbol in cold init: %s\n",
+                        namechars);
+        }
+
+        link_target = (void*)(((uintptr_t)link_target)+LINKAGE_TABLE_ENTRY_SIZE);
+    }
+    odxprint(runtime_link, "%d total symbols linked, %d undefined",
+             n, m);
+    if (strict && m)
+        /* We could proceed, but rather than run into improperly
+         * displayed internal errors, let's make ourselves heard right
+         * here and now. */
+        lose("Undefined aliens in cold init.");
+}
+#endif  /* sb-dynamic-core */