diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 21 | ||||
| -rw-r--r-- | ext_example/vector.c (renamed from vector.c) | 4 | ||||
| -rw-r--r-- | interp.c | 6 | ||||
| -rw-r--r-- | primitives.c | 30 | ||||
| -rw-r--r-- | primitives.h | 1 | ||||
| -rw-r--r-- | tests/vector.lisp | 2 | ||||
| -rw-r--r-- | vector.h | 8 |
8 files changed, 52 insertions, 21 deletions
@@ -2,6 +2,7 @@ *.d *.a *.bin +*.so bamboo-lisp compile_commands.json .cache @@ -1,7 +1,7 @@ mode ?= debug cc = gcc -includes = -DWITHREADLINE +includes = -DWITHREADLINE -fPIC ldflags = -lm -lreadline -lalgds ifeq ($(mode), debug) @@ -9,7 +9,7 @@ ifeq ($(mode), debug) -g \ -fsanitize=address else - cflags = $(includes) -g -O2 + cflags = $(includes) -O2 endif src = $(shell find ./ -maxdepth 1 -name '*.c' -not -name 'main.c') @@ -20,8 +20,11 @@ tests_bin=$(tests:.c=.bin) all: bamboo-lisp -install: bamboo-lisp - sudo cp bamboo-lisp /usr/local/bin/bamboo +install: bamboo-lisp libbamboo-lisp.a + sudo cp bamboo-lisp /usr/local/bin/bamboo-lisp + sudo cp libbamboo-lisp.a /usr/local/lib/ + sudo mkdir -p /usr/local/include/bamboo_lisp + sudo cp *.h /usr/local/include/bamboo_lisp/ prelude.c: prelude.lisp cat prelude.lisp | python scripts/genprelude.py > prelude.c @@ -32,7 +35,10 @@ bamboo-lisp: $(obj) main.o libbamboo-lisp.a: $(obj) ar cr $@ $^ -test: bamboo-lisp $(tests_bin) +ext_example/vector.so: ext_example/vector.c libbamboo-lisp.a + gcc -shared $(cflags) -I./ -o $@ $^ $(ldflags) + +test: bamboo-lisp $(tests_bin) ext_example/vector.so @echo @echo "Run tests:" @scripts/runall.sh $(tests_bin) @@ -52,7 +58,10 @@ $(tests_bin):%.bin:%.c $(obj) $(libs) clean: -rm $(shell find tests/ -name '*.bin') - -rm $(shell find . -name '*.o' -or -name '*.a' -or -name '*.d') + -rm $(shell find . -name '*.so') + -rm $(shell find . -name '*.o') + -rm $(shell find . -name '*.a') + -rm $(shell find . -name '*.d') -rm bamboo-lisp DEPS := $(shell find . -name '*.d') diff --git a/vector.c b/ext_example/vector.c index 453800b..0aa3006 100644 --- a/vector.c +++ b/ext_example/vector.c @@ -1,4 +1,3 @@ -#include "vector.h" #include "interp.h" #include "sexp.h" @@ -112,7 +111,7 @@ static void vector_gcmark(Interp *interp, SExpPtrVector *gcstack, void *vself) { } -void bamboo_lisp_init_vector(Interp *interp) { +int bamboo_lisp_ext_init(Interp *interp) { bamboo_lisp_array_meta.type = "vector"; bamboo_lisp_array_meta.free = &vector_free; bamboo_lisp_array_meta.gcmark = &vector_gcmark; @@ -125,4 +124,5 @@ void bamboo_lisp_init_vector(Interp *interp) { Interp_add_userfunc(interp, "vector-remove", &vector_delete); Interp_add_userfunc(interp, "vector-length", &vector_length); Interp_add_userfunc(interp, "vector-set", &vector_set); + return 1; } @@ -12,8 +12,6 @@ #include "parser.h" #include "prelude.h" -#include "vector.h" - #define BUFSIZE 1024 bool SExpRef_eq(SExpRef a, SExpRef b) { @@ -148,6 +146,7 @@ void Interp_init(Interp *self) { Interp_add_primitive(self, "assert-error", primitive_assert_error); Interp_add_primitive(self, "assert-exception", primitive_assert_exception); Interp_add_primitive(self, "load", primitive_load); + Interp_add_primitive(self, "loadext", primitive_loadext); Interp_add_primitive(self, "try", primitive_try); Interp_add_primitive(self, "unwind-protect", primitive_unwind_protect); @@ -260,9 +259,6 @@ void Interp_init(Interp *self) { Interp_add_userfunc(self, "_gcstat", builtin_gcstat); Interp_add_userfunc(self, "_alwaysgc", builtin_alwaysgc); - // extentions - bamboo_lisp_init_vector(self); - SExpRef ret = Interp_eval_string(self, bamboo_lisp_prelude); Interp *interp = self; if (VALTYPE(ret) == kErrSignal) { diff --git a/primitives.c b/primitives.c index 971aa87..1b49bfe 100644 --- a/primitives.c +++ b/primitives.c @@ -3,6 +3,8 @@ #include "sexp.h" #include "parser.h" +#include <dlfcn.h> + SExpRef primitive_assert_exception(Interp *interp, SExpRef args, bool istail) { SExpRef eargs = lisp_eval_args(interp, args); if (VALTYPE(eargs) == kExceptionSignal) return interp->t; @@ -69,6 +71,34 @@ SExpRef primitive_load(Interp *interp, SExpRef args, bool istail) { return ret; } +typedef int (*BambooLispExtInitFn)(Interp *interp); + +SExpRef primitive_loadext(Interp *interp, SExpRef args, bool istail) { + if (CAR(interp->stack).idx != interp->top_level.idx) { + return new_error(interp, "loadext: loadext can only be in top level.\n"); + } + if (LENGTH(args) != 1) return new_error(interp, "loadext: syntax error.\n"); + args = lisp_eval_args(interp, args); + if (VALTYPE(CAR(args)) != kStringSExp) return new_error(interp, "loadext: syntax error.\n"); + const char *filename = REF(CAR(args))->str; + void *handle = dlopen(filename, RTLD_LAZY); + if (!handle) { + return new_error(interp, "Failed to load library: %s\n", dlerror()); + } + dlerror(); + BambooLispExtInitFn init_func = (BambooLispExtInitFn)dlsym(handle, "bamboo_lisp_ext_init"); + const char *error; + if ((error = dlerror()) != NULL) { + dlclose(handle); + return new_error(interp, "Failed to locate symbol: %s\n", error); + } + int ret = (*init_func)(interp); + if (ret < 0) { + return new_error(interp, "Failed to init ext: %s\n", filename); + } + return NIL; +} + SExpRef primitive_return(Interp *interp, SExpRef args, bool istail) { if (LENGTH(args) > 1) { return new_error(interp, "return: syntax error.\n"); diff --git a/primitives.h b/primitives.h index cd686fe..ae97b64 100644 --- a/primitives.h +++ b/primitives.h @@ -6,6 +6,7 @@ SExpRef primitive_assert_error(Interp *interp, SExpRef sexp, bool istail); SExpRef primitive_assert_exception(Interp *interp, SExpRef sexp, bool istail); SExpRef primitive_load(Interp *interp, SExpRef sexp, bool istail); +SExpRef primitive_loadext(Interp *interp, SExpRef sexp, bool istail); SExpRef primitive_return(Interp *interp, SExpRef sexp, bool istail); SExpRef primitive_break(Interp *interp, SExpRef sexp, bool istail); SExpRef primitive_continue(Interp *interp, SExpRef sexp, bool istail); diff --git a/tests/vector.lisp b/tests/vector.lisp index d4f7231..10afde4 100644 --- a/tests/vector.lisp +++ b/tests/vector.lisp @@ -1,3 +1,5 @@ +(loadext "ext_example/vector.so") + (assert (vector? (make-vector))) (assert (not (vector? 1))) diff --git a/vector.h b/vector.h deleted file mode 100644 index 34113d1..0000000 --- a/vector.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef BAMBOO_LISP_VECTOR_H_ -#define BAMBOO_LISP_VECTOR_H_ - -#include "interp.h" - -void bamboo_lisp_init_vector(Interp *interp); - -#endif |