merge guile-vm into libguile itself
authorAndy Wingo <wingo@pobox.com>
Fri, 22 Aug 2008 01:39:30 +0000 (18:39 -0700)
committerAndy Wingo <wingo@pobox.com>
Fri, 22 Aug 2008 01:39:30 +0000 (18:39 -0700)
commit83495480e8e401d99158222f61d5c96fd2480e24
treecdc006fdec9fda0909563b9daacf207e31265afa
parentbe52b55a3213c8f683d1007a542771daa3f9a06b
merge guile-vm into libguile itself

* ice-9/boot-9.scm: Only define load-compiled as #f if it's not already
  defined, which won't normally be the case.

* libguile/guile-vm.c: Removed, there's no more guile-vm binary.

* libguile/frames.c: (with change frame? -> heap-frame?)
* libguile/frames.h:
* libguile/instructions.c:
* libguile/instructions.h:
* libguile/objcodes.c:
* libguile/objcodes.h:
* libguile/programs.c:
* libguile/programs.h:
* libguile/vm-bootstrap.h: (was bootstrap.h)
* libguile/vm-engine.c: (was vm_engine.c)
* libguile/vm-engine.h: (was vm_engine.h)
* libguile/vm-expand.h: (was vm_expand.h)
* libguile/vm-i-loader.c: (was vm_loader.c)
* libguile/vm-i-scheme.c: (was vm_scheme.c)
* libguile/vm-i-system.c: (was vm_system.c)
* libguile/vm.c:
* libguile/vm.h: These files moved here from src/, as guile-vm is now a
  part of libguile.

* libguile/init.c: Bootstrap the VM. Yay!

* libguile/Makefile.am: The necessary chicanery here.

* module/system/vm/Makefile.am:
* module/system/vm/bootstrap.scm:
* module/system/vm/frame.scm:
* module/system/vm/instruction.scm:
* module/system/vm/objcode.scm:
* module/system/vm/program.scm:
* module/system/vm/vm.scm:

* pre-inst-guile-env.in: Add builddirs to the load path; add module/ to
  the path in the empty-$GUILE_LOAD_PATH case as well.

* src/Makefile.am: Moved out everything except guilec and guile-disasm,
  which probably should be moved to the scripts directory?

* testsuite/Makefile.am: Update to find guile-vm in the right place.

* module/system/vm/Makefile.am:
* module/system/vm/bootstrap.scm: Removed bootstrap.scm, scm_init_guile
  handles the bootstrapping for us.

* module/system/vm/frame.scm:
* module/system/vm/instruction.scm:
* module/system/vm/objcode.scm:
* module/system/vm/program.scm:
* module/system/vm/vm.scm: Call the init functions in libguile; should
  fix at some point to avoid the dlopen?
31 files changed:
ice-9/boot-9.scm
libguile/Makefile.am
libguile/frames.c [moved from src/frames.c with 97% similarity]
libguile/frames.h [moved from src/frames.h with 99% similarity]
libguile/init.c
libguile/instructions.c [moved from src/instructions.c with 97% similarity]
libguile/instructions.h [moved from src/instructions.h with 97% similarity]
libguile/objcodes.c [moved from src/objcodes.c with 99% similarity]
libguile/objcodes.h [moved from src/objcodes.h with 100% similarity]
libguile/programs.c [moved from src/programs.c with 99% similarity]
libguile/programs.h [moved from src/programs.h with 100% similarity]
libguile/vm-bootstrap.h [moved from src/bootstrap.h with 100% similarity]
libguile/vm-engine.c [moved from src/vm_engine.c with 96% similarity]
libguile/vm-engine.h [moved from src/vm_engine.h with 100% similarity]
libguile/vm-expand.h [moved from src/vm_expand.h with 100% similarity]
libguile/vm-i-loader.c [moved from src/vm_loader.c with 100% similarity]
libguile/vm-i-scheme.c [moved from src/vm_scheme.c with 100% similarity]
libguile/vm-i-system.c [moved from src/vm_system.c with 100% similarity]
libguile/vm.c [moved from src/vm.c with 98% similarity]
libguile/vm.h [moved from src/vm.h with 100% similarity]
module/system/vm/Makefile.am
module/system/vm/bootstrap.scm [deleted file]
module/system/vm/frame.scm
module/system/vm/instruction.scm
module/system/vm/objcode.scm
module/system/vm/program.scm
module/system/vm/vm.scm
pre-inst-guile-env.in
src/Makefile.am
src/guile-vm.c [deleted file]
testsuite/Makefile.am