mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 11:50:28 +02:00
* gdbinit: Untested attempts to get the stack fondling macros to deal with the new program representation. * libguile/frames.c (scm_vm_frame_arguments, scm_vm_frame_source) (scm_vm_frame_local_ref, scm_vm_frame_local_set_x): SCM_PROGRAM_DATA is a struct scm_objcode*. * libguile/instructions.h: * libguile/instructions.c: Hide the instruction table and the struct scm_instruction structure; all access to instructions now goes through procedures. This is because instructions are no longer in a packed array indexed by opcode. Also, declare a mask that all instructions should fit in. * libguile/objcodes.h: * libguile/objcodes.c: Rewrite so that object code directly maps its arity and length from its bytecode. This makes it unnecessary to keep this information in programs, allowing programs to be simple conses between the code (objcodes) and data (the object table and the closure variables). * libguile/programs.c (scm_make_program): Rework so that make-program takes objcode, an object table, and externals as arguments. It's much clearer this way, and we avoid malloc(). * libguile/stacks.c (is_vm_bootstrap_frame): Update for program/objcode changes. * libguile/vm-engine.c (vm_run): Initialize the jump table on the first run, with the opcodes declared in the instruction sources, and with bad instructions raising an error instead of wandering off into the Unknown. * libguile/vm-engine.h (FETCH_LENGTH): Always represent lengths as 3 bytes. The old code was too error-prone. (NEXT_JUMP): Mask the instruction with SCM_VM_INSTRUCTION_MASK. (NEW_FRAME): Update for program/objcode changes. * libguile/vm-expand.h (VM_DEFINE_FUNCTION, VM_DEFINE_INSTRUCTION) (VM_DEFINE_LOADER): Update so that we explicitly specify opcodes, so that we have a stable bytecode API. * libguile/vm-i-loader.c: Update license to LGPLv2+. Explicitly declare opcodes. (load-integer): Use an int instead of a long as the accumulator; still need to revisit this code at some point, I think. (load-program): Simplify, thankfully!! Just creates the objcode slice and rolls with it. * libguile/vm-i-scheme.c: Number the opcodes explicitly. * libguile/vm-i-system.c: Update license to LGPLv2+. Explicitly declare opcodes. (make-closure): Update for new program API. * libguile/vm.c (vm_make_boot_program): Update for new program/objcode API. Still a bit ugly. (scm_load_compiled_with_vm): Update for new program/objcode API. * module/language/assembly.scm (byte-length): Fix byte-length calculation for loaders, and load-program. (code-pack, code-unpack): Start to move things from (system vm conv) here. (object->code, code->object): More things from conv.scm. * module/language/glil.scm (<glil-program>): Add a new field, closure-level. (make-glil-program, compute-closure-level): Calculate the "closure level" when making a glil program. This is the maximum depth of external binding refs in this closure. (unparse-glil): Fix label serialization. * module/language/glil/compile-assembly.scm (make-meta): Prepend #f for the meta's object table, though maybe in the future we can avoid creating assembly in the first place. (assoc-ref-or-acons, object-index-and-alist): GRRR! Caught again by the different sets of arguments to assoc and assoc-ref! (glil->assembly): Attempt to make the <glil-program> case more readable, and fix the bugs. Sorry I don't know how to comment this change any more than this. (glil->assembly): For <glil-module> serialize the whole key, not just the name. (dump-object): subprogram-code is already a list. Serialize integers as strings, not u8vectors. Fix the order of lists and vectors. * module/language/glil/spec.scm (glil): Switch orders, so we prefer glil -> assembly -> objcode. Actually glil->objcode doesn't work any more, needs to be removed I think. * module/language/objcode/spec.scm (objcode->value): s/objcode->program/make-program/. * module/language/scheme/inline.scm: Add acons inline. * module/system/vm/conv.scm (make-byte-decoder): Skip the first 8 bytes, they are header. Handle subprograms properly. Still needs help though. (decode-length): Lengths are always 3 bytes now. * module/system/vm/disasm.scm: Superficial changes to keep things working. I'd like to fix this better in the future. * module/system/vm/frame.scm (bootstrap-frame?): Fixes for program-bytecode. * module/system/vm/program.scm: Export make-program. It's program-objcode now, no more program-bytecode. * module/system/vm/vm.scm (vm-load): Use make-program. * test-suite/tests/asm-to-bytecode.test: New test, very minimal. * module/system/vm/objcode.scm: Export word-size, byte-order, and write-objcode.
438 lines
12 KiB
C
438 lines
12 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. */
|
||
|
||
/* This file is included in vm_engine.c */
|
||
|
||
/*
|
||
* Options
|
||
*/
|
||
|
||
#define VM_USE_HOOKS 1 /* Various hooks */
|
||
#define VM_USE_CLOCK 1 /* Bogoclock */
|
||
#define VM_CHECK_EXTERNAL 1 /* Check external link */
|
||
#define VM_CHECK_OBJECT 1 /* Check object table */
|
||
|
||
|
||
/*
|
||
* Registers
|
||
*/
|
||
|
||
/* Register optimization. [ stolen from librep/src/lispmach.h,v 1.3 ]
|
||
|
||
Some compilers underestimate the use of the local variables representing
|
||
the abstract machine registers, and don't put them in hardware registers,
|
||
which slows down the interpreter considerably.
|
||
For GCC, I have hand-assigned hardware registers for several architectures.
|
||
*/
|
||
|
||
#ifdef __GNUC__
|
||
#ifdef __mips__
|
||
#define IP_REG asm("$16")
|
||
#define SP_REG asm("$17")
|
||
#define FP_REG asm("$18")
|
||
#endif
|
||
#ifdef __sparc__
|
||
#define IP_REG asm("%l0")
|
||
#define SP_REG asm("%l1")
|
||
#define FP_REG asm("%l2")
|
||
#endif
|
||
#ifdef __alpha__
|
||
#ifdef __CRAY__
|
||
#define IP_REG asm("r9")
|
||
#define SP_REG asm("r10")
|
||
#define FP_REG asm("r11")
|
||
#else
|
||
#define IP_REG asm("$9")
|
||
#define SP_REG asm("$10")
|
||
#define FP_REG asm("$11")
|
||
#endif
|
||
#endif
|
||
#ifdef __i386__
|
||
#define IP_REG asm("%esi")
|
||
#define SP_REG asm("%edi")
|
||
#define FP_REG
|
||
#endif
|
||
#if defined(PPC) || defined(_POWER) || defined(_IBMR2)
|
||
#define IP_REG asm("26")
|
||
#define SP_REG asm("27")
|
||
#define FP_REG asm("28")
|
||
#endif
|
||
#ifdef __hppa__
|
||
#define IP_REG asm("%r18")
|
||
#define SP_REG asm("%r17")
|
||
#define FP_REG asm("%r16")
|
||
#endif
|
||
#ifdef __mc68000__
|
||
#define IP_REG asm("a5")
|
||
#define SP_REG asm("a4")
|
||
#define FP_REG
|
||
#endif
|
||
#ifdef __arm__
|
||
#define IP_REG asm("r9")
|
||
#define SP_REG asm("r8")
|
||
#define FP_REG asm("r7")
|
||
#endif
|
||
#endif
|
||
|
||
#ifndef IP_REG
|
||
#define IP_REG
|
||
#endif
|
||
#ifndef SP_REG
|
||
#define SP_REG
|
||
#endif
|
||
#ifndef FP_REG
|
||
#define FP_REG
|
||
#endif
|
||
|
||
|
||
/*
|
||
* Cache/Sync
|
||
*/
|
||
|
||
#ifdef VM_ENABLE_ASSERTIONS
|
||
# define ASSERT(condition) if (SCM_UNLIKELY (!(condition))) abort()
|
||
#else
|
||
# define ASSERT(condition)
|
||
#endif
|
||
|
||
|
||
#define CACHE_REGISTER() \
|
||
{ \
|
||
ip = vp->ip; \
|
||
sp = vp->sp; \
|
||
fp = vp->fp; \
|
||
stack_base = fp ? SCM_FRAME_UPPER_ADDRESS (fp) - 1 : vp->stack_base; \
|
||
}
|
||
|
||
#define SYNC_REGISTER() \
|
||
{ \
|
||
vp->ip = ip; \
|
||
vp->sp = sp; \
|
||
vp->fp = fp; \
|
||
}
|
||
|
||
#ifdef VM_ENABLE_PARANOID_ASSERTIONS
|
||
#define CHECK_IP() \
|
||
do { if (ip < bp->base || ip - bp->base > bp->len) abort (); } while (0)
|
||
#else
|
||
#define CHECK_IP()
|
||
#endif
|
||
|
||
/* Get a local copy of the program's "object table" (i.e. the vector of
|
||
external bindings that are referenced by the program), initialized by
|
||
`load-program'. */
|
||
/* XXX: We could instead use the "simple vector macros", thus not having to
|
||
call `scm_vector_writable_elements ()' and the likes. */
|
||
#define CACHE_PROGRAM() \
|
||
{ \
|
||
if (bp != SCM_PROGRAM_DATA (program)) { \
|
||
bp = SCM_PROGRAM_DATA (program); \
|
||
if (SCM_I_IS_VECTOR (SCM_PROGRAM_OBJTABLE (program))) { \
|
||
objects = SCM_I_VECTOR_WELTS (SCM_PROGRAM_OBJTABLE (program)); \
|
||
object_count = SCM_I_VECTOR_LENGTH (SCM_PROGRAM_OBJTABLE (program)); \
|
||
} else { \
|
||
objects = NULL; \
|
||
object_count = 0; \
|
||
} \
|
||
} \
|
||
}
|
||
|
||
#define SYNC_BEFORE_GC() \
|
||
{ \
|
||
SYNC_REGISTER (); \
|
||
}
|
||
|
||
#define SYNC_ALL() \
|
||
{ \
|
||
SYNC_REGISTER (); \
|
||
}
|
||
|
||
|
||
/*
|
||
* Error check
|
||
*/
|
||
|
||
#undef CHECK_EXTERNAL
|
||
#if VM_CHECK_EXTERNAL
|
||
#define CHECK_EXTERNAL(e) \
|
||
do { if (!SCM_CONSP (e)) goto vm_error_external; } while (0)
|
||
#else
|
||
#define CHECK_EXTERNAL(e)
|
||
#endif
|
||
|
||
/* Accesses to a program's object table. */
|
||
#if VM_CHECK_OBJECT
|
||
#define CHECK_OBJECT(_num) \
|
||
do { if ((_num) >= object_count) goto vm_error_object; } while (0)
|
||
#else
|
||
#define CHECK_OBJECT(_num)
|
||
#endif
|
||
|
||
|
||
/*
|
||
* Hooks
|
||
*/
|
||
|
||
#undef RUN_HOOK
|
||
#if VM_USE_HOOKS
|
||
#define RUN_HOOK(h) \
|
||
{ \
|
||
if (SCM_UNLIKELY (!SCM_FALSEP (vp->hooks[h])))\
|
||
{ \
|
||
SYNC_REGISTER (); \
|
||
vm_dispatch_hook (vm, vp->hooks[h], hook_args); \
|
||
CACHE_REGISTER (); \
|
||
} \
|
||
}
|
||
#else
|
||
#define RUN_HOOK(h)
|
||
#endif
|
||
|
||
#define BOOT_HOOK() RUN_HOOK (SCM_VM_BOOT_HOOK)
|
||
#define HALT_HOOK() RUN_HOOK (SCM_VM_HALT_HOOK)
|
||
#define NEXT_HOOK() RUN_HOOK (SCM_VM_NEXT_HOOK)
|
||
#define BREAK_HOOK() RUN_HOOK (SCM_VM_BREAK_HOOK)
|
||
#define ENTER_HOOK() RUN_HOOK (SCM_VM_ENTER_HOOK)
|
||
#define APPLY_HOOK() RUN_HOOK (SCM_VM_APPLY_HOOK)
|
||
#define EXIT_HOOK() RUN_HOOK (SCM_VM_EXIT_HOOK)
|
||
#define RETURN_HOOK() RUN_HOOK (SCM_VM_RETURN_HOOK)
|
||
|
||
|
||
/*
|
||
* Stack operation
|
||
*/
|
||
|
||
#ifdef VM_ENABLE_STACK_NULLING
|
||
# define CHECK_STACK_LEAKN(_n) ASSERT (!sp[_n]);
|
||
# define CHECK_STACK_LEAK() CHECK_STACK_LEAKN(1)
|
||
# define NULLSTACK(_n) { int __x = _n; CHECK_STACK_LEAKN (_n+1); while (__x > 0) sp[__x--] = NULL; }
|
||
/* If you have a nonlocal exit in a pre-wind proc while invoking a continuation
|
||
inside a dynwind (phew!), the stack is fully rewound but vm_reset_stack for
|
||
that continuation doesn't have a chance to run. It's not important on a
|
||
semantic level, but it does mess up our stack nulling -- so this macro is to
|
||
fix that. */
|
||
# define NULLSTACK_FOR_NONLOCAL_EXIT() if (vp->sp > sp) NULLSTACK (vp->sp - sp);
|
||
#else
|
||
# define CHECK_STACK_LEAKN(_n)
|
||
# define CHECK_STACK_LEAK()
|
||
# define NULLSTACK(_n)
|
||
# define NULLSTACK_FOR_NONLOCAL_EXIT()
|
||
#endif
|
||
|
||
#define CHECK_OVERFLOW() \
|
||
if (sp > stack_limit) \
|
||
goto vm_error_stack_overflow
|
||
|
||
#define CHECK_UNDERFLOW() \
|
||
if (sp < stack_base) \
|
||
goto vm_error_stack_underflow;
|
||
|
||
#define PUSH(x) do { sp++; CHECK_OVERFLOW (); *sp = x; } while (0)
|
||
#define DROP() do { sp--; CHECK_UNDERFLOW (); NULLSTACK (1); } while (0)
|
||
#define DROPN(_n) do { sp -= (_n); CHECK_UNDERFLOW (); NULLSTACK (_n); } while (0)
|
||
#define POP(x) do { x = *sp; DROP (); } while (0)
|
||
|
||
/* A fast CONS. This has to be fast since its used, for instance, by
|
||
POP_LIST when fetching a function's argument list. Note: `scm_cell' is an
|
||
inlined function in Guile 1.7. Unfortunately, it calls
|
||
`scm_gc_for_newcell ()' which is _not_ inlined and allocated cells on the
|
||
heap. XXX */
|
||
#define CONS(x,y,z) \
|
||
{ \
|
||
SYNC_BEFORE_GC (); \
|
||
x = scm_cell (SCM_UNPACK (y), SCM_UNPACK (z)); \
|
||
}
|
||
|
||
/* Pop the N objects on top of the stack and push a list that contains
|
||
them. */
|
||
#define POP_LIST(n) \
|
||
do \
|
||
{ \
|
||
int i; \
|
||
SCM l = SCM_EOL, x; \
|
||
for (i = n; i; i--) \
|
||
{ \
|
||
POP (x); \
|
||
CONS (l, x, l); \
|
||
} \
|
||
PUSH (l); \
|
||
} while (0)
|
||
|
||
/* The opposite: push all of the elements in L onto the list. */
|
||
#define PUSH_LIST(l, NILP) \
|
||
do \
|
||
{ \
|
||
for (; scm_is_pair (l); l = SCM_CDR (l)) \
|
||
PUSH (SCM_CAR (l)); \
|
||
if (SCM_UNLIKELY (!NILP (l))) { \
|
||
err_args = scm_list_1 (l); \
|
||
goto vm_error_improper_list; \
|
||
} \
|
||
} while (0)
|
||
|
||
|
||
#define POP_LIST_MARK() \
|
||
do { \
|
||
SCM o; \
|
||
SCM l = SCM_EOL; \
|
||
POP (o); \
|
||
while (!SCM_UNBNDP (o)) \
|
||
{ \
|
||
CONS (l, o, l); \
|
||
POP (o); \
|
||
} \
|
||
PUSH (l); \
|
||
} while (0)
|
||
|
||
#define POP_CONS_MARK() \
|
||
do { \
|
||
SCM o, l; \
|
||
POP (l); \
|
||
POP (o); \
|
||
while (!SCM_UNBNDP (o)) \
|
||
{ \
|
||
CONS (l, o, l); \
|
||
POP (o); \
|
||
} \
|
||
PUSH (l); \
|
||
} while (0)
|
||
|
||
|
||
/*
|
||
* Instruction operation
|
||
*/
|
||
|
||
#define FETCH() (*ip++)
|
||
#define FETCH_LENGTH(len) do { len=*ip++; len<<=8; len+=*ip++; len<<=8; len+=*ip++; } while (0)
|
||
|
||
#undef CLOCK
|
||
#if VM_USE_CLOCK
|
||
#define CLOCK(n) vp->clock += n
|
||
#else
|
||
#define CLOCK(n)
|
||
#endif
|
||
|
||
#undef NEXT_JUMP
|
||
#ifdef HAVE_LABELS_AS_VALUES
|
||
#define NEXT_JUMP() goto *jump_table[FETCH () & SCM_VM_INSTRUCTION_MASK]
|
||
#else
|
||
#define NEXT_JUMP() goto vm_start
|
||
#endif
|
||
|
||
#define NEXT \
|
||
{ \
|
||
CLOCK (1); \
|
||
NEXT_HOOK (); \
|
||
CHECK_STACK_LEAK (); \
|
||
NEXT_JUMP (); \
|
||
}
|
||
|
||
|
||
/*
|
||
* Stack frame
|
||
*/
|
||
|
||
#define INIT_ARGS() \
|
||
{ \
|
||
if (bp->nrest) \
|
||
{ \
|
||
int n = nargs - (bp->nargs - 1); \
|
||
if (n < 0) \
|
||
goto vm_error_wrong_num_args; \
|
||
/* NB, can cause GC while setting up the \
|
||
stack frame */ \
|
||
POP_LIST (n); \
|
||
} \
|
||
else \
|
||
{ \
|
||
if (nargs != bp->nargs) \
|
||
goto vm_error_wrong_num_args; \
|
||
} \
|
||
}
|
||
|
||
/* See frames.h for the layout of stack frames */
|
||
/* When this is called, bp points to the new program data,
|
||
and the arguments are already on the stack */
|
||
#define NEW_FRAME() \
|
||
{ \
|
||
int i; \
|
||
SCM *dl, *data; \
|
||
scm_byte_t *ra = ip; \
|
||
\
|
||
/* Save old registers */ \
|
||
ra = ip; \
|
||
dl = fp; \
|
||
\
|
||
/* New registers */ \
|
||
fp = sp - bp->nargs + 1; \
|
||
data = SCM_FRAME_DATA_ADDRESS (fp); \
|
||
sp = data + 3; \
|
||
CHECK_OVERFLOW (); \
|
||
stack_base = sp; \
|
||
ip = bp->base; \
|
||
\
|
||
/* Init local variables */ \
|
||
for (i=bp->nlocs; i; i--) \
|
||
data[-i] = SCM_UNDEFINED; \
|
||
\
|
||
/* Set frame data */ \
|
||
data[3] = (SCM)ra; \
|
||
data[2] = 0x0; \
|
||
data[1] = (SCM)dl; \
|
||
\
|
||
/* Postpone initializing external vars, \
|
||
because if the CONS causes a GC, we \
|
||
want the stack marker to see the data \
|
||
array formatted as expected. */ \
|
||
data[0] = SCM_UNDEFINED; \
|
||
external = SCM_PROGRAM_EXTERNALS (fp[-1]); \
|
||
for (i = 0; i < bp->nexts; i++) \
|
||
CONS (external, SCM_UNDEFINED, external); \
|
||
data[0] = external; \
|
||
}
|
||
|
||
#define CACHE_EXTERNAL() external = fp[bp->nargs + bp->nlocs]
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|