summaryrefslogtreecommitdiff
path: root/libguile/dynl-shl.c
diff options
context:
space:
mode:
Diffstat (limited to 'libguile/dynl-shl.c')
-rw-r--r--libguile/dynl-shl.c130
1 files changed, 28 insertions, 102 deletions
diff --git a/libguile/dynl-shl.c b/libguile/dynl-shl.c
index b8e474484..4612fa9c8 100644
--- a/libguile/dynl-shl.c
+++ b/libguile/dynl-shl.c
@@ -45,128 +45,54 @@
Author: Aubrey Jaffer
Modified for libguile by Marius Vollmer */
-#include "_scm.h"
-#include "genio.h"
-#include "smob.h"
-
#include "dl.h"
-#define SHL(obj) ((shl_t*)SCM_CDR(obj))
-
-static int printshl SCM_P ((SCM exp, SCM port, scm_printstate *pstate));
-
-static int
-prinshl (exp, port, pstate)
- SCM exp;
- SCM port;
- scm_printstate *pstate;
-{
- scm_gen_puts (scm_regular_string, "#<dynamic-linked ", port);
- scm_intprint (SCM_CDR (exp), 16, port);
- scm_gen_putc ('>', port);
- return 1;
-}
-
-int scm_tc16_shl;
-static scm_smobfuns shlsmob = { scm_mark0, scm_free0, prinshl };
-
-SCM_PROC (s_dynamic_link, "dynamic-link", 1, 0, 0, scm_dynamic_link);
-
-SCM
-scm_dynamic_link (fname)
- SCM fname;
+static void *
+sysdep_dynl_link (fname, subr)
+ char *fname;
+ char *subr;
{
- SCM z;
shl_t shl;
- fname = scm_coerce_rostring (fname, s_dynamic_link, SCM_ARG1);
-
- SCM_DEFER_INTS;
- shl = shl_load (SCM_CHARS (fname), BIND_DEFERRED , 0L);
+ shl = shl_load (fname, BIND_DEFERRED , 0L);
if (NULL==shl)
- scm_misc_error (s_dynamic_link, "dynamic linking failed", SCM_EOL);
- SCM_NEWCELL (z);
- SCM_SETCHARS (z, shl);
- SCM_SETCAR (z, scm_tc16_shl);
- SCM_ALLOW_INTS;
-
- return z;
+ scm_misc_error (subr, "dynamic linking failed", SCM_EOL);
+ return shl;
}
-SCM_PROC (s_dynamic_call, "dynamic-call", 2, 0, 0, scm_dynamic_call);
-
-SCM
-scm_dynamic_call (symb, shl)
- SCM symb, shl;
+static void
+sysdep_dynl_unlink (handle, subr)
+ void *handle;
+ char *subr;
{
- void (*func)() = 0;
- int i;
-
- symb = scm_coerce_rostring (symb, s_dynamic_call, SCM_ARG1);
- SCM_ASSERT (SCM_NIMP (shl) && SCM_CAR (shl) == scm_tc16_shl, shl, SCM_ARG2,
- s_dynamic_call);
-
- SCM_DEFER_INTS;
- if (shl_findsym (&SHL(shl), SCM_CHARS(symb), TYPE_PROCEDURE, &func))
- scm_misc_error (s_dynamic_call, "undefined function",
- scm_cons (symb, SCM_EOL));
- SCM_ALLOW_INTS;
-
- (*func) ();
- return SCM_BOOL_T;
-}
-
-SCM_PROC (s_dynamic_args_call, "dynamic-args-call", 3, 0, 0, scm_dynamic_args_call);
-
-SCM
-scm_dynamic_args_call (symb, shl, args)
- SCM symb, shl, args;
-{
- int i, argc;
- char **argv;
- int (*func) SCM_P ((int argc, char **argv)) = 0;
-
- symb = scm_coerce_rostring (symb, s_dynamic_args_call, SCM_ARG1);
- SCM_ASSERT (SCM_NIMP (shl) && SCM_CAR(shl) == scm_tc16_shl, shl, SCM_ARG2,
- s_dynamic_args_call);
-
- SCM_DEFER_INTS;
- if (shl_findsym(&SHL(shl), SCM_CHARS(symb), TYPE_PROCEDURE, &func))
- scm_misc_error (s_dynamic_call, "undefined function: %s",
- scm_cons (symb, SCM_EOL));
- argv = scm_make_argv_from_stringlist (args, &argc, s_dynamic_args_call,
- SCM_ARG3);
- SCM_ALLOW_INTS;
-
- i = (*func) (argc, argv);
+ int status;
SCM_DEFER_INTS;
- scm_must_free_argv (argv);
+ status = shl_unload ((shl_t) handle);
SCM_ALLOW_INTS;
- return SCM_MAKINUM (0L+i);
+ if (status)
+ scm_misc_error (subr, "dynamic unlinking failed", SCM_EOL);
}
-SCM_PROC (s_dynamic_unlink, "dynamic-unlink", 1, 0, 0, scm_dynamic_unlink);
-
-SCM
-scm_dynamic_unlink (shl)
- SCM shl;
+static void *
+sysdep_dynl_func (symb, handle, subr)
+ char *symb;
+ void *handle;
+ char *subr;
{
+ void (*func)() = NULL;
int status;
- SCM_ASSERT (SCM_NIMP (shl) && SCM_CAR (shl) == scm_tc16_shl, shl,
- SCM_ARG1, s_dynamic_unlink);
SCM_DEFER_INTS;
- status = shl_unload (SHL (shl));
+ status = shl_findsym ((shl_t) handle, symb, TYPE_PROCEDURE, &func);
SCM_ALLOW_INTS;
- if (!status)
- return SCM_BOOL_T;
- return SCM_BOOL_F;
+ if (status)
+ scm_misc_error (s_dynamic_call, "undefined function",
+ scm_cons (scm_makfrom0str (symb), SCM_EOL));
+ return func;
}
-void
-scm_init_dynamic_linking ()
+static void
+sysdep_dynl_init ()
{
- scm_tc16_shl = scm_newsmob (&shlsmob);
-#include "dynl.x"
}