mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
83495480e8
* 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?
103 lines
3.7 KiB
C
103 lines
3.7 KiB
C
/* 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 software; see the file COPYING. If not, write to
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307 USA
|
|
*
|
|
* As a special exception, the Free Software Foundation gives permission
|
|
* for additional uses of the text contained in its release of GUILE.
|
|
*
|
|
* The exception is that, if you link the GUILE library with other files
|
|
* to produce an executable, this does not by itself cause the
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
* Your use of that executable is in no way restricted on account of
|
|
* linking the GUILE library code into it.
|
|
*
|
|
* This exception does not however invalidate any other reasons why
|
|
* the executable file might be covered by the GNU General Public License.
|
|
*
|
|
* This exception applies only to the code released by the
|
|
* Free Software Foundation under the name GUILE. If you copy
|
|
* code from other Free Software Foundation releases into a copy of
|
|
* GUILE, as the General Public License permits, the exception does
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
* anyone as to the status of such modified files, you must delete
|
|
* this exception notice from them.
|
|
*
|
|
* If you write modifications of your own for GUILE, it is your choice
|
|
* whether to permit this exception to apply to your modifications.
|
|
* If you do not wish that, delete this exception notice. */
|
|
|
|
#ifndef VM_LABEL
|
|
#define VM_LABEL(tag) l_##tag
|
|
#define VM_OPCODE(tag) scm_op_##tag
|
|
|
|
#ifdef HAVE_LABELS_AS_VALUES
|
|
#define VM_TAG(tag) VM_LABEL(tag):
|
|
#define VM_ADDR(tag) &&VM_LABEL(tag)
|
|
#else /* not HAVE_LABELS_AS_VALUES */
|
|
#define VM_TAG(tag) case VM_OPCODE(tag):
|
|
#define VM_ADDR(tag) NULL
|
|
#endif /* not HAVE_LABELS_AS_VALUES */
|
|
#endif /* VM_LABEL */
|
|
|
|
#undef VM_DEFINE_INSTRUCTION
|
|
#undef VM_DEFINE_FUNCTION
|
|
#undef VM_DEFINE_LOADER
|
|
#ifdef VM_INSTRUCTION_TO_TABLE
|
|
/*
|
|
* These will go to scm_instruction_table in vm.c
|
|
*/
|
|
#define VM_DEFINE_INSTRUCTION(tag,name,len,npop,npush) \
|
|
{VM_OPCODE (tag), name, len, npop, npush},
|
|
#define VM_DEFINE_FUNCTION(tag,name,nargs) \
|
|
{VM_OPCODE (tag), name, 0, nargs, 1},
|
|
#define VM_DEFINE_LOADER(tag,name) \
|
|
{VM_OPCODE (tag), name, -1, 0, 1},
|
|
|
|
#else
|
|
#ifdef VM_INSTRUCTION_TO_LABEL
|
|
/*
|
|
* These will go to jump_table in vm_engine.c
|
|
*/
|
|
#define VM_DEFINE_INSTRUCTION(tag,name,len,npop,npush) VM_ADDR (tag),
|
|
#define VM_DEFINE_FUNCTION(tag,name,nargs) VM_ADDR (tag),
|
|
#define VM_DEFINE_LOADER(tag,name) VM_ADDR (tag),
|
|
|
|
#else
|
|
#ifdef VM_INSTRUCTION_TO_OPCODE
|
|
/*
|
|
* These will go to scm_opcode in vm.h
|
|
*/
|
|
#define VM_DEFINE_INSTRUCTION(tag,name,len,npop,npush) VM_OPCODE (tag),
|
|
#define VM_DEFINE_FUNCTION(tag,name,nargs) VM_OPCODE (tag),
|
|
#define VM_DEFINE_LOADER(tag,name) VM_OPCODE (tag),
|
|
|
|
#else /* Otherwise */
|
|
/*
|
|
* These are directly included in vm_engine.c
|
|
*/
|
|
#define VM_DEFINE_INSTRUCTION(tag,name,len,npop,npush) VM_TAG (tag)
|
|
#define VM_DEFINE_FUNCTION(tag,name,nargs) VM_TAG (tag)
|
|
#define VM_DEFINE_LOADER(tag,name) VM_TAG (tag)
|
|
|
|
#endif /* VM_INSTRUCTION_TO_OPCODE */
|
|
#endif /* VM_INSTRUCTION_TO_LABEL */
|
|
#endif /* VM_INSTRUCTION_TO_TABLE */
|
|
|
|
/*
|
|
Local Variables:
|
|
c-file-style: "gnu"
|
|
End:
|
|
*/
|