summaryrefslogtreecommitdiff
path: root/module/system/vm/vm.scm
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2008-08-07 13:11:27 +0200
committerAndy Wingo <wingo@pobox.com>2008-08-07 13:11:27 +0200
commit07e56b27a1841d70e562ac69b9ef9d25d489ceb3 (patch)
tree5953919e3b45e6e3c1f5a472da088a666fd1a96c /module/system/vm/vm.scm
parent1865ad56804be4da82a6247a868a81648ebe87b3 (diff)
downloadguile-07e56b27a1841d70e562ac69b9ef9d25d489ceb3.tar.gz
big reorg of scheme modules -- e.g. programs.c -> (system vm program)
This reorganization kills the ugly module-export-all hacks in bootstrap.scm and core.scm. In fact, it gets rid of core.scm entirely, breaking out its functionality into separate files. * module/system/vm/trace.scm: * module/system/vm/profile.scm: * module/system/vm/disasm.scm: * module/system/vm/debug.scm: * module/system/vm/conv.scm: * module/system/vm/assemble.scm: * module/system/repl/repl.scm: * module/system/repl/common.scm: * module/system/base/compile.scm: * module/system/repl/command.scm: Update for changes, and fix a bug in procedure-documentation. * module/system/vm/bootstrap.scm: Just call scm_bootstrap_vm, which handles setting load-compiled for us. * module/system/vm/core.scm: Removed, functionality folded into other modules. * module/system/vm/frame.scm: Export the C frame procedures here; also move scheme functions from core.scm here. * module/system/vm/instruction.scm: New file, exports procedures from instructions.c. * module/system/vm/objcode.scm: New file, exports procedures from objcodes.c. * module/system/vm/program.scm: New file, exports procedures from programs.c, and some scheme functions originally from core.scm. * module/system/vm/vm.scm: New file, from vm.c and core.scm. * src/Makefile.am (libguile_vm_la_SOURCES): Add bootstrap.h. * src/bootstrap.h: New file, prototypes scm_bootstrap_vm (), which the scm_init_* functions call. * src/frames.h: * src/frames.c (scm_init_frames): * src/frames.c (scm_bootstrap_frames): * src/vm.h: * src/instructions.h: * src/instructions.c (scm_init_instructions): * src/instructions.c (scm_bootstrap_instructions): * src/objcodes.h: * src/objcodes.c (scm_bootstrap_objcodes): * src/objcodes.c (scm_init_objcodes): * src/programs.h: * src/programs.c (scm_bootstrap_programs): * src/programs.c (scm_init_programs): * src/vm.c (scm_bootstrap_vm): * src/vm.c (scm_init_vm): Call scm_bootstrap_vm() before doing anything in an init function. Bootstrap_vm will call bootstrap_instructions(), etc to initialize types, then set load-compiled to point to load-compiled/vm. * src/vm.c (scm_load_compiled_with_vm): Code to load .go files, if they're present.
Diffstat (limited to 'module/system/vm/vm.scm')
-rw-r--r--module/system/vm/vm.scm62
1 files changed, 62 insertions, 0 deletions
diff --git a/module/system/vm/vm.scm b/module/system/vm/vm.scm
new file mode 100644
index 000000000..5fd719ca5
--- /dev/null
+++ b/module/system/vm/vm.scm
@@ -0,0 +1,62 @@
+;;; Guile VM core
+
+;; 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 vm)
+ :use-module (system vm frame)
+ :use-module (system vm objcode)
+ :export (vm? the-vm make-vm vm-version
+ vm:ip vm:sp vm:fp
+
+ vm-load vm-return-value
+
+ vm-option set-vm-option! vm-version
+
+ vm-fetch-locals vm-fetch-externals
+ vm-last-frame vm-this-frame vm-fetch-stack
+ vm-current-frame-chain vm-last-frame-chain
+
+ vm-stats vms:time vms:clock
+
+ 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"))
+
+(define (vm-current-frame-chain vm)
+ (make-frame-chain (vm-this-frame vm) (vm:ip vm)))
+
+(define (vm-last-frame-chain vm)
+ (make-frame-chain (vm-last-frame vm) (vm:ip vm)))
+
+(define (vm-fetch-locals vm)
+ (frame-local-variables (vm-this-frame vm)))
+
+(define (vm-fetch-externals vm)
+ (frame-external-variables (vm-this-frame vm)))
+
+(define (vm-return-value vm)
+ (car (vm-fetch-stack vm)))
+
+(define (vms:time stat) (vector-ref stat 0))
+(define (vms:clock stat) (vector-ref stat 1))
+
+(define (vm-load vm objcode)
+ (vm (objcode->program objcode)))