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.
302 lines
7.8 KiB
C
302 lines
7.8 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. */
|
||
|
||
#if HAVE_CONFIG_H
|
||
# include <config.h>
|
||
#endif
|
||
|
||
#include <string.h>
|
||
#include "vm-bootstrap.h"
|
||
#include "frames.h"
|
||
|
||
|
||
scm_t_bits scm_tc16_vm_frame;
|
||
|
||
#define RELOC(frame, val) (val + SCM_VM_FRAME_OFFSET (frame))
|
||
|
||
SCM
|
||
scm_c_make_vm_frame (SCM stack_holder, SCM *fp, SCM *sp,
|
||
scm_byte_t *ip, scm_t_ptrdiff offset)
|
||
{
|
||
struct scm_vm_frame *p = scm_gc_malloc (sizeof (struct scm_vm_frame),
|
||
"vmframe");
|
||
p->stack_holder = stack_holder;
|
||
p->fp = fp;
|
||
p->sp = sp;
|
||
p->ip = ip;
|
||
p->offset = offset;
|
||
SCM_RETURN_NEWSMOB (scm_tc16_vm_frame, p);
|
||
}
|
||
|
||
static SCM
|
||
vm_frame_mark (SCM obj)
|
||
{
|
||
return SCM_VM_FRAME_STACK_HOLDER (obj);
|
||
}
|
||
|
||
static scm_sizet
|
||
vm_frame_free (SCM obj)
|
||
{
|
||
struct scm_vm_frame *p = SCM_VM_FRAME_DATA (obj);
|
||
scm_gc_free (p, sizeof(struct scm_vm_frame), "vmframe");
|
||
return 0;
|
||
}
|
||
|
||
/* Scheme interface */
|
||
|
||
SCM_DEFINE (scm_vm_frame_p, "vm-frame?", 1, 0, 0,
|
||
(SCM obj),
|
||
"")
|
||
#define FUNC_NAME s_scm_vm_frame_p
|
||
{
|
||
return SCM_BOOL (SCM_VM_FRAME_P (obj));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_vm_frame_program, "vm-frame-program", 1, 0, 0,
|
||
(SCM frame),
|
||
"")
|
||
#define FUNC_NAME s_scm_vm_frame_program
|
||
{
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
return SCM_FRAME_PROGRAM (SCM_VM_FRAME_FP (frame));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_vm_frame_arguments, "vm-frame-arguments", 1, 0, 0,
|
||
(SCM frame),
|
||
"")
|
||
#define FUNC_NAME s_scm_vm_frame_arguments
|
||
{
|
||
SCM *fp;
|
||
int i;
|
||
struct scm_objcode *bp;
|
||
SCM ret;
|
||
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
|
||
fp = SCM_VM_FRAME_FP (frame);
|
||
bp = SCM_PROGRAM_DATA (SCM_FRAME_PROGRAM (fp));
|
||
|
||
if (!bp->nargs)
|
||
return SCM_EOL;
|
||
else if (bp->nrest)
|
||
ret = fp[bp->nargs - 1];
|
||
else
|
||
ret = scm_cons (fp[bp->nargs - 1], SCM_EOL);
|
||
|
||
for (i = bp->nargs - 2; i >= 0; i--)
|
||
ret = scm_cons (fp[i], ret);
|
||
|
||
return ret;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_vm_frame_source, "vm-frame-source", 1, 0, 0,
|
||
(SCM frame),
|
||
"")
|
||
#define FUNC_NAME s_scm_vm_frame_source
|
||
{
|
||
SCM *fp;
|
||
struct scm_objcode *bp;
|
||
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
|
||
fp = SCM_VM_FRAME_FP (frame);
|
||
bp = SCM_PROGRAM_DATA (SCM_FRAME_PROGRAM (fp));
|
||
|
||
return scm_c_program_source (SCM_FRAME_PROGRAM (fp),
|
||
SCM_VM_FRAME_IP (frame) - bp->base);
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_vm_frame_local_ref, "vm-frame-local-ref", 2, 0, 0,
|
||
(SCM frame, SCM index),
|
||
"")
|
||
#define FUNC_NAME s_scm_vm_frame_local_ref
|
||
{
|
||
SCM *fp;
|
||
unsigned int i;
|
||
struct scm_objcode *bp;
|
||
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
|
||
fp = SCM_VM_FRAME_FP (frame);
|
||
bp = SCM_PROGRAM_DATA (SCM_FRAME_PROGRAM (fp));
|
||
|
||
SCM_VALIDATE_UINT_COPY (2, index, i);
|
||
SCM_ASSERT_RANGE (2, index, i < bp->nargs + bp->nlocs);
|
||
|
||
return SCM_FRAME_VARIABLE (fp, i);
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_vm_frame_local_set_x, "vm-frame-local-set!", 3, 0, 0,
|
||
(SCM frame, SCM index, SCM val),
|
||
"")
|
||
#define FUNC_NAME s_scm_vm_frame_local_set_x
|
||
{
|
||
SCM *fp;
|
||
unsigned int i;
|
||
struct scm_objcode *bp;
|
||
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
|
||
fp = SCM_VM_FRAME_FP (frame);
|
||
bp = SCM_PROGRAM_DATA (SCM_FRAME_PROGRAM (fp));
|
||
|
||
SCM_VALIDATE_UINT_COPY (2, index, i);
|
||
SCM_ASSERT_RANGE (2, index, i < bp->nargs + bp->nlocs);
|
||
|
||
SCM_FRAME_VARIABLE (fp, i) = val;
|
||
|
||
return SCM_UNSPECIFIED;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_vm_frame_return_address, "vm-frame-return-address", 1, 0, 0,
|
||
(SCM frame),
|
||
"")
|
||
#define FUNC_NAME s_scm_vm_frame_return_address
|
||
{
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
return scm_from_ulong ((unsigned long)
|
||
(SCM_FRAME_RETURN_ADDRESS
|
||
(SCM_VM_FRAME_FP (frame))));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_vm_frame_mv_return_address, "vm-frame-mv-return-address", 1, 0, 0,
|
||
(SCM frame),
|
||
"")
|
||
#define FUNC_NAME s_scm_vm_frame_mv_return_address
|
||
{
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
return scm_from_ulong ((unsigned long)
|
||
(SCM_FRAME_MV_RETURN_ADDRESS
|
||
(SCM_VM_FRAME_FP (frame))));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_vm_frame_dynamic_link, "vm-frame-dynamic-link", 1, 0, 0,
|
||
(SCM frame),
|
||
"")
|
||
#define FUNC_NAME s_scm_vm_frame_dynamic_link
|
||
{
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
/* fixme: munge fp if holder is a continuation */
|
||
return scm_from_ulong
|
||
((unsigned long)
|
||
RELOC (frame,
|
||
SCM_FRAME_DYNAMIC_LINK (SCM_VM_FRAME_FP (frame))));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_vm_frame_external_link, "vm-frame-external-link", 1, 0, 0,
|
||
(SCM frame),
|
||
"")
|
||
#define FUNC_NAME s_scm_vm_frame_external_link
|
||
{
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
return SCM_FRAME_EXTERNAL_LINK (SCM_VM_FRAME_FP (frame));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_vm_frame_stack, "vm-frame-stack", 1, 0, 0,
|
||
(SCM frame),
|
||
"")
|
||
#define FUNC_NAME s_scm_vm_frame_stack
|
||
{
|
||
SCM *top, *bottom, ret = SCM_EOL;
|
||
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
|
||
top = SCM_VM_FRAME_SP (frame);
|
||
bottom = SCM_FRAME_UPPER_ADDRESS (SCM_VM_FRAME_FP (frame));
|
||
while (bottom <= top)
|
||
ret = scm_cons (*bottom++, ret);
|
||
|
||
return ret;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
extern SCM
|
||
scm_c_vm_frame_prev (SCM frame)
|
||
{
|
||
SCM *this_fp, *new_fp, *new_sp;
|
||
this_fp = SCM_VM_FRAME_FP (frame);
|
||
new_fp = SCM_FRAME_DYNAMIC_LINK (this_fp);
|
||
if (new_fp)
|
||
{ new_fp = RELOC (frame, new_fp);
|
||
new_sp = SCM_FRAME_LOWER_ADDRESS (this_fp) - 1;
|
||
return scm_c_make_vm_frame (SCM_VM_FRAME_STACK_HOLDER (frame),
|
||
new_fp, new_sp,
|
||
SCM_FRAME_RETURN_ADDRESS (this_fp),
|
||
SCM_VM_FRAME_OFFSET (frame));
|
||
}
|
||
else
|
||
return SCM_BOOL_F;
|
||
}
|
||
|
||
|
||
void
|
||
scm_bootstrap_frames (void)
|
||
{
|
||
scm_tc16_vm_frame = scm_make_smob_type ("vm-frame", 0);
|
||
scm_set_smob_mark (scm_tc16_vm_frame, vm_frame_mark);
|
||
scm_set_smob_free (scm_tc16_vm_frame, vm_frame_free);
|
||
}
|
||
|
||
void
|
||
scm_init_frames (void)
|
||
{
|
||
scm_bootstrap_vm ();
|
||
|
||
#ifndef SCM_MAGIC_SNARFER
|
||
#include "frames.x"
|
||
#endif
|
||
}
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|