diff options
Diffstat (limited to 'module/system/vm')
-rw-r--r-- | module/system/vm/Makefile.am | 2 | ||||
-rw-r--r-- | module/system/vm/bootstrap.scm | 31 | ||||
-rw-r--r-- | module/system/vm/frame.scm | 7 | ||||
-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 |
7 files changed, 9 insertions, 39 deletions
diff --git a/module/system/vm/Makefile.am b/module/system/vm/Makefile.am index 29b50b747..8996a5a66 100644 --- a/module/system/vm/Makefile.am +++ b/module/system/vm/Makefile.am @@ -1,4 +1,4 @@ -SOURCES = assemble.scm bootstrap.scm conv.scm debug.scm \ +SOURCES = assemble.scm conv.scm debug.scm \ disasm.scm frame.scm instruction.scm objcode.scm \ profile.scm program.scm trace.scm vm.scm moddir = $(guiledir)/system/vm diff --git a/module/system/vm/bootstrap.scm b/module/system/vm/bootstrap.scm deleted file mode 100644 index 6ecd83554..000000000 --- a/module/system/vm/bootstrap.scm +++ /dev/null @@ -1,31 +0,0 @@ -;;; Bootstrapping the VM into the interpreter - -;; Copyright (C) 2001 Free Software Foundation, Inc. - -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) -;; any later version. -;; -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. -;; -;; You should have received a copy of the GNU General Public License -;; along with this program; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. - -;;; Code: - -(define-module (system vm bootstrap)) - -;;; -;;; Core procedures -;;; - -;; Calling this updates boot-9.scm's `load-compiled' to point to to -;; scm_load_compiled_with_vm, so future module loads will read .go files -;; if they are present. -(dynamic-call "scm_bootstrap_vm" (dynamic-link "libguile-vm")) diff --git a/module/system/vm/frame.scm b/module/system/vm/frame.scm index d732309f0..8014fa77c 100644 --- a/module/system/vm/frame.scm +++ b/module/system/vm/frame.scm @@ -32,9 +32,10 @@ frame-object-name frame-local-ref frame-external-link frame-local-set! frame-return-address frame-program - frame-dynamic-link frame?)) + frame-dynamic-link heap-frame?)) -(dynamic-call "scm_init_frames" (dynamic-link "libguile-vm")) +;; fixme: avoid the dynamic-call? +(dynamic-call "scm_init_frames" (dynamic-link "libguile")) ;;; ;;; Frame chain @@ -123,7 +124,7 @@ (let ((prog (frame-program frame)) (link (frame-dynamic-link frame))) (or (object-property prog 'name) - (and (frame? link) + (and (heap-frame? link) (frame-object-name link (1- (frame-address link)) prog)) (hash-fold (lambda (s v d) (if (eq? prog (variable-ref v)) s d)) prog (module-obarray (current-module)))))) diff --git a/module/system/vm/instruction.scm b/module/system/vm/instruction.scm index e8b325a7f..31d5309f3 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-vm")) +(dynamic-call "scm_init_instructions" (dynamic-link "libguile")) diff --git a/module/system/vm/objcode.scm b/module/system/vm/objcode.scm index a814d5b85..b7218f846 100644 --- a/module/system/vm/objcode.scm +++ b/module/system/vm/objcode.scm @@ -23,4 +23,4 @@ :export (objcode->u8vector objcode? objcode->program bytecode->objcode load-objcode)) -(dynamic-call "scm_init_objcodes" (dynamic-link "libguile-vm")) +(dynamic-call "scm_init_objcodes" (dynamic-link "libguile")) diff --git a/module/system/vm/program.scm b/module/system/vm/program.scm index a0ccee5f0..cdb975060 100644 --- a/module/system/vm/program.scm +++ b/module/system/vm/program.scm @@ -30,7 +30,7 @@ program-bytecode program? program-objects program-base program-external)) -(dynamic-call "scm_init_programs" (dynamic-link "libguile-vm")) +(dynamic-call "scm_init_programs" (dynamic-link "libguile")) (define arity:nargs car) (define arity:nrest cadr) diff --git a/module/system/vm/vm.scm b/module/system/vm/vm.scm index b6a47953e..e0395eae1 100644 --- a/module/system/vm/vm.scm +++ b/module/system/vm/vm.scm @@ -38,7 +38,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-vm")) +(dynamic-call "scm_init_vm" (dynamic-link "libguile")) (define (vm-current-frame-chain vm) (make-frame-chain (vm-this-frame vm) (vm:ip vm))) |