diff options
author | Andy Wingo <wingo@pobox.com> | 2009-03-28 22:31:20 -0700 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-03-28 22:31:20 -0700 |
commit | 9c0cd73e614e338528e1d323dedec54f3dfad1d8 (patch) | |
tree | f9b153084447d2c2d36efbdf052b331c3278fc12 /module | |
parent | 6ecae97fb8dca2e5e26af44a649a706431c65756 (diff) | |
parent | a5fc657043e1af9b2e79799059069f8172afb66c (diff) | |
download | guile-9c0cd73e614e338528e1d323dedec54f3dfad1d8.tar.gz |
Merge branch 'wingo'
Diffstat (limited to 'module')
-rw-r--r-- | module/system/vm/frame.scm | 3 | ||||
-rw-r--r-- | module/system/vm/instruction.scm | 2 | ||||
-rw-r--r-- | module/system/vm/objcode.scm | 2 | ||||
-rw-r--r-- | module/system/vm/program.scm | 2 | ||||
-rw-r--r-- | module/system/vm/vm.scm | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/module/system/vm/frame.scm b/module/system/vm/frame.scm index a74d903da..33a1e1b60 100644 --- a/module/system/vm/frame.scm +++ b/module/system/vm/frame.scm @@ -42,8 +42,7 @@ frame-return-address frame-program frame-dynamic-link heap-frame?)) -;; fixme: avoid the dynamic-call? -(dynamic-call "scm_init_frames" (dynamic-link "libguile")) +(load-extension "libguile" "scm_init_frames") ;;; ;;; Frame chain diff --git a/module/system/vm/instruction.scm b/module/system/vm/instruction.scm index c820e9952..3ad718ea8 100644 --- a/module/system/vm/instruction.scm +++ b/module/system/vm/instruction.scm @@ -25,4 +25,4 @@ instruction-pops instruction-pushes instruction->opcode opcode->instruction)) -(dynamic-call "scm_init_instructions" (dynamic-link "libguile")) +(load-extension "libguile" "scm_init_instructions") diff --git a/module/system/vm/objcode.scm b/module/system/vm/objcode.scm index df1ff26e4..ab6bb4bae 100644 --- a/module/system/vm/objcode.scm +++ b/module/system/vm/objcode.scm @@ -25,4 +25,4 @@ load-objcode write-objcode word-size byte-order)) -(dynamic-call "scm_init_objcodes" (dynamic-link "libguile")) +(load-extension "libguile" "scm_init_objcodes") diff --git a/module/system/vm/program.scm b/module/system/vm/program.scm index 7e4007b75..5a490b9d9 100644 --- a/module/system/vm/program.scm +++ b/module/system/vm/program.scm @@ -36,7 +36,7 @@ program-objcode program? program-objects program-module program-base program-external)) -(dynamic-call "scm_init_programs" (dynamic-link "libguile")) +(load-extension "libguile" "scm_init_programs") (define arity:nargs car) (define arity:nrest cadr) diff --git a/module/system/vm/vm.scm b/module/system/vm/vm.scm index de5c3fa21..48dc4f2b8 100644 --- a/module/system/vm/vm.scm +++ b/module/system/vm/vm.scm @@ -32,7 +32,7 @@ vm-next-hook vm-apply-hook vm-boot-hook vm-return-hook vm-break-hook vm-exit-hook vm-halt-hook vm-enter-hook)) -(dynamic-call "scm_init_vm" (dynamic-link "libguile")) +(load-extension "libguile" "scm_init_vm") (define (vms:time stat) (vector-ref stat 0)) (define (vms:clock stat) (vector-ref stat 1)) |