summaryrefslogtreecommitdiff
path: root/libguile/vm.h
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2009-08-20 14:27:38 +0200
committerAndy Wingo <wingo@pobox.com>2009-08-20 18:52:51 +0200
commit2fb924f64f6cf47a9b4d6e8a22433ac2c5739379 (patch)
treedfe2aa5484ef14797a7c659f2b0cd873d54dd37b /libguile/vm.h
parentcdde57b2f11a6c28518aebed234b98ce5bd7131f (diff)
downloadguile-2fb924f64f6cf47a9b4d6e8a22433ac2c5739379.tar.gz
programs have their own tc7 now
* libguile/tags.h (scm_tc7_program): * libguile/programs.h: Programs now have their own tc7 code. Fix up the macros appropriately. * libguile/programs.c: Remove smobby bits, leaving marking, printing, and application for other parts of Guile. * libguile/debug.c (scm_procedure_source): * libguile/eval.c (scm_trampoline_0, scm_trampoline_1) (scm_trampoline_2): Add cases for tc7_program. * libguile/eval.i.c (CEVAL, SCM_APPLY): * libguile/evalext.c (scm_self_evaluating_p): * libguile/gc-card.c (scm_i_sweep_card, scm_i_tag_name): * libguile/gc-mark.c (1): * libguile/print.c (iprin1): * libguile/procs.c (scm_procedure_p, scm_thunk_p) * libguile/vm-i-system.c (make-closure): Adapt to new procedure representation. * libguile/procprop.c (scm_i_procedure_arity): Do the right thing for programs. * test-suite/tests/procprop.test ("procedure-arity"): Arity test now succeeds. * libguile/goops.c (scm_class_of): Programs now belong to the class <procedure>, not a smob class. * libguile/vm.h (struct vm, struct vm_cont): * libguile/vm-engine.c (vm_engine): * libguile/frames.h (SCM_FRAME_BYTE_CAST, struct vm_frame): * libguile/frames.c (scm_c_make_vm_frame): Fix usages of scm_byte_t, changing them to scm_t_uint8.
Diffstat (limited to 'libguile/vm.h')
-rw-r--r--libguile/vm.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libguile/vm.h b/libguile/vm.h
index b079c7aa0..eace1cb69 100644
--- a/libguile/vm.h
+++ b/libguile/vm.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2009 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -41,7 +41,7 @@ typedef SCM (*scm_t_vm_engine) (struct scm_vm *vp, SCM program, SCM *argv, int n
#define SCM_VM_NUM_ENGINES 2
struct scm_vm {
- scm_byte_t *ip; /* instruction pointer */
+ scm_t_uint8 *ip; /* instruction pointer */
SCM *sp; /* stack pointer */
SCM *fp; /* frame pointer */
size_t stack_size; /* stack size */
@@ -88,7 +88,7 @@ SCM_API SCM scm_vm_stats (SCM vm);
SCM_API SCM scm_vm_trace_frame (SCM vm);
struct scm_vm_cont {
- scm_byte_t *ip;
+ scm_t_uint8 *ip;
SCM *sp;
SCM *fp;
scm_t_ptrdiff stack_size;