diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-08-17 23:39:56 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-08-18 00:06:45 +0200 |
commit | fbb857a472eb4e69c1cba05e86646b7004f32df6 (patch) | |
tree | ff23e64de5a558b575ed812349d8af6e64d8ceb4 /libguile/vm-i-system.c | |
parent | 49c9839eae84f7f3cd10db45f389fa1ea1050659 (diff) | |
parent | e33a910dd0f430f34c32fe6846899aee33fc2cf6 (diff) | |
download | guile-fbb857a472eb4e69c1cba05e86646b7004f32df6.tar.gz |
Merge branch 'master' into boehm-demers-weiser-gc
Conflicts:
lib/Makefile.am
libguile/Makefile.am
libguile/frames.c
libguile/gc-card.c
libguile/gc-freelist.c
libguile/gc-mark.c
libguile/gc-segment.c
libguile/gc_os_dep.c
libguile/load.c
libguile/macros.c
libguile/objcodes.c
libguile/programs.c
libguile/strings.c
libguile/vm.c
m4/gnulib-cache.m4
m4/gnulib-comp.m4
m4/inline.m4
Diffstat (limited to 'libguile/vm-i-system.c')
-rw-r--r-- | libguile/vm-i-system.c | 496 |
1 files changed, 325 insertions, 171 deletions
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c index c1ea1c161..b298c88a6 100644 --- a/libguile/vm-i-system.c +++ b/libguile/vm-i-system.c @@ -1,18 +1,19 @@ /* Copyright (C) 2001,2008,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 as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 3 of + * the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of + * This library 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA */ @@ -138,13 +139,62 @@ VM_DEFINE_INSTRUCTION (13, make_int16, "make-int16", 2, 0, 1) NEXT; } -VM_DEFINE_INSTRUCTION (14, make_char8, "make-char8", 1, 0, 1) +VM_DEFINE_INSTRUCTION (14, make_int64, "make-int64", 8, 0, 1) { - PUSH (SCM_MAKE_CHAR (FETCH ())); + scm_t_uint64 v = 0; + v += FETCH (); + v <<= 8; v += FETCH (); + v <<= 8; v += FETCH (); + v <<= 8; v += FETCH (); + v <<= 8; v += FETCH (); + v <<= 8; v += FETCH (); + v <<= 8; v += FETCH (); + v <<= 8; v += FETCH (); + PUSH (scm_from_int64 ((scm_t_int64) v)); NEXT; } -VM_DEFINE_INSTRUCTION (15, list, "list", 2, -1, 1) +VM_DEFINE_INSTRUCTION (15, make_uint64, "make-uint64", 8, 0, 1) +{ + scm_t_uint64 v = 0; + v += FETCH (); + v <<= 8; v += FETCH (); + v <<= 8; v += FETCH (); + v <<= 8; v += FETCH (); + v <<= 8; v += FETCH (); + v <<= 8; v += FETCH (); + v <<= 8; v += FETCH (); + v <<= 8; v += FETCH (); + PUSH (scm_from_uint64 (v)); + NEXT; +} + +VM_DEFINE_INSTRUCTION (16, make_char8, "make-char8", 1, 0, 1) +{ + scm_t_uint8 v = 0; + v = FETCH (); + + PUSH (SCM_MAKE_CHAR (v)); + /* Don't simplify this to PUSH (SCM_MAKE_CHAR (FETCH ())). The + contents of SCM_MAKE_CHAR may be evaluated more than once, + resulting in a double fetch. */ + NEXT; +} + +VM_DEFINE_INSTRUCTION (42, make_char32, "make-char32", 4, 0, 1) +{ + scm_t_wchar v = 0; + v += FETCH (); + v <<= 8; v += FETCH (); + v <<= 8; v += FETCH (); + v <<= 8; v += FETCH (); + PUSH (SCM_MAKE_CHAR (v)); + NEXT; +} + + + +VM_DEFINE_INSTRUCTION (17, list, "list", 2, -1, 1) { unsigned h = FETCH (); unsigned l = FETCH (); @@ -153,7 +203,7 @@ VM_DEFINE_INSTRUCTION (15, list, "list", 2, -1, 1) NEXT; } -VM_DEFINE_INSTRUCTION (16, vector, "vector", 2, -1, 1) +VM_DEFINE_INSTRUCTION (18, vector, "vector", 2, -1, 1) { unsigned h = FETCH (); unsigned l = FETCH (); @@ -171,19 +221,19 @@ VM_DEFINE_INSTRUCTION (16, vector, "vector", 2, -1, 1) NEXT; } -VM_DEFINE_INSTRUCTION (17, list_mark, "list-mark", 0, 0, 0) +VM_DEFINE_INSTRUCTION (19, list_mark, "list-mark", 0, 0, 0) { POP_LIST_MARK (); NEXT; } -VM_DEFINE_INSTRUCTION (18, cons_mark, "cons-mark", 0, 0, 0) +VM_DEFINE_INSTRUCTION (20, cons_mark, "cons-mark", 0, 0, 0) { POP_CONS_MARK (); NEXT; } -VM_DEFINE_INSTRUCTION (19, vector_mark, "vector-mark", 0, 0, 0) +VM_DEFINE_INSTRUCTION (21, vector_mark, "vector-mark", 0, 0, 0) { POP_LIST_MARK (); SYNC_REGISTER (); @@ -191,7 +241,7 @@ VM_DEFINE_INSTRUCTION (19, vector_mark, "vector-mark", 0, 0, 0) NEXT; } -VM_DEFINE_INSTRUCTION (20, list_break, "list-break", 0, 0, 0) +VM_DEFINE_INSTRUCTION (22, list_break, "list-break", 0, 0, 0) { SCM l; POP (l); @@ -217,9 +267,11 @@ VM_DEFINE_INSTRUCTION (20, list_break, "list-break", 0, 0, 0) #define VARIABLE_SET(v,o) SCM_VARIABLE_SET (v, o) #define VARIABLE_BOUNDP(v) (VARIABLE_REF (v) != SCM_UNDEFINED) +#define FREE_VARIABLE_REF(i) free_vars[i] + /* ref */ -VM_DEFINE_INSTRUCTION (21, object_ref, "object-ref", 1, 0, 1) +VM_DEFINE_INSTRUCTION (23, object_ref, "object-ref", 1, 0, 1) { register unsigned objnum = FETCH (); CHECK_OBJECT (objnum); @@ -227,33 +279,41 @@ VM_DEFINE_INSTRUCTION (21, object_ref, "object-ref", 1, 0, 1) NEXT; } -VM_DEFINE_INSTRUCTION (22, local_ref, "local-ref", 1, 0, 1) +/* FIXME: necessary? elt 255 of the vector could be a vector... */ +VM_DEFINE_INSTRUCTION (24, long_object_ref, "long-object-ref", 2, 0, 1) +{ + unsigned int objnum = FETCH (); + objnum <<= 8; + objnum += FETCH (); + CHECK_OBJECT (objnum); + PUSH (OBJECT_REF (objnum)); + NEXT; +} + +VM_DEFINE_INSTRUCTION (25, local_ref, "local-ref", 1, 0, 1) { PUSH (LOCAL_REF (FETCH ())); + ASSERT_BOUND (*sp); NEXT; } -VM_DEFINE_INSTRUCTION (23, external_ref, "external-ref", 1, 0, 1) +VM_DEFINE_INSTRUCTION (26, long_local_ref, "long-local-ref", 2, 0, 1) { - unsigned int i; - SCM e = external; - for (i = FETCH (); i; i--) - { - CHECK_EXTERNAL(e); - e = SCM_CDR (e); - } - CHECK_EXTERNAL(e); - PUSH (SCM_CAR (e)); + unsigned int i = FETCH (); + i <<= 8; + i += FETCH (); + PUSH (LOCAL_REF (i)); + ASSERT_BOUND (*sp); NEXT; } -VM_DEFINE_INSTRUCTION (24, variable_ref, "variable-ref", 0, 0, 1) +VM_DEFINE_INSTRUCTION (27, variable_ref, "variable-ref", 0, 0, 1) { SCM x = *sp; if (!VARIABLE_BOUNDP (x)) { - finish_args = SCM_LIST1 (x); + finish_args = scm_list_1 (x); /* Was: finish_args = SCM_LIST1 (SCM_CAR (x)); */ goto vm_error_unbound; } @@ -266,7 +326,7 @@ VM_DEFINE_INSTRUCTION (24, variable_ref, "variable-ref", 0, 0, 1) NEXT; } -VM_DEFINE_INSTRUCTION (25, toplevel_ref, "toplevel-ref", 1, 0, 1) +VM_DEFINE_INSTRUCTION (28, toplevel_ref, "toplevel-ref", 1, 0, 1) { unsigned objnum = FETCH (); SCM what; @@ -276,41 +336,37 @@ VM_DEFINE_INSTRUCTION (25, toplevel_ref, "toplevel-ref", 1, 0, 1) if (!SCM_VARIABLEP (what)) { SYNC_REGISTER (); - if (SCM_LIKELY (SCM_SYMBOLP (what))) - { - SCM mod = SCM_EOL; - if (SCM_LIKELY (scm_module_system_booted_p - && scm_is_true ((mod = scm_program_module (program))))) - /* might longjmp */ - what = scm_module_lookup (mod, what); - else - what = scm_sym2var (what, SCM_BOOL_F, SCM_BOOL_F); - } - else + what = resolve_variable (what, scm_program_module (program)); + if (!VARIABLE_BOUNDP (what)) { - SCM mod; - /* compilation of @ or @@ - `what' is a three-element list: (MODNAME SYM INTERFACE?) - INTERFACE? is #t if we compiled @ or #f if we compiled @@ - */ - mod = scm_resolve_module (SCM_CAR (what)); - if (scm_is_true (SCM_CADDR (what))) - mod = scm_module_public_interface (mod); - if (SCM_FALSEP (mod)) - { - finish_args = SCM_LIST1 (mod); - goto vm_error_no_such_module; - } - /* might longjmp */ - what = scm_module_lookup (mod, SCM_CADR (what)); + finish_args = scm_list_1 (what); + goto vm_error_unbound; } - + OBJECT_SET (objnum, what); + } + + PUSH (VARIABLE_REF (what)); + NEXT; +} + +VM_DEFINE_INSTRUCTION (29, long_toplevel_ref, "long-toplevel-ref", 2, 0, 1) +{ + SCM what; + unsigned int objnum = FETCH (); + objnum <<= 8; + objnum += FETCH (); + CHECK_OBJECT (objnum); + what = OBJECT_REF (objnum); + + if (!SCM_VARIABLEP (what)) + { + SYNC_REGISTER (); + what = resolve_variable (what, scm_program_module (program)); if (!VARIABLE_BOUNDP (what)) { - finish_args = SCM_LIST1 (what); + finish_args = scm_list_1 (what); goto vm_error_unbound; } - OBJECT_SET (objnum, what); } @@ -320,36 +376,31 @@ VM_DEFINE_INSTRUCTION (25, toplevel_ref, "toplevel-ref", 1, 0, 1) /* set */ -VM_DEFINE_INSTRUCTION (26, local_set, "local-set", 1, 1, 0) +VM_DEFINE_INSTRUCTION (30, local_set, "local-set", 1, 1, 0) { LOCAL_SET (FETCH (), *sp); DROP (); NEXT; } -VM_DEFINE_INSTRUCTION (27, external_set, "external-set", 1, 1, 0) +VM_DEFINE_INSTRUCTION (31, long_local_set, "long-local-set", 2, 1, 0) { - unsigned int i; - SCM e = external; - for (i = FETCH (); i; i--) - { - CHECK_EXTERNAL(e); - e = SCM_CDR (e); - } - CHECK_EXTERNAL(e); - SCM_SETCAR (e, *sp); + unsigned int i = FETCH (); + i <<= 8; + i += FETCH (); + LOCAL_SET (i, *sp); DROP (); NEXT; } -VM_DEFINE_INSTRUCTION (28, variable_set, "variable-set", 0, 1, 0) +VM_DEFINE_INSTRUCTION (32, variable_set, "variable-set", 0, 1, 0) { VARIABLE_SET (sp[0], sp[-1]); DROPN (2); NEXT; } -VM_DEFINE_INSTRUCTION (29, toplevel_set, "toplevel-set", 1, 1, 0) +VM_DEFINE_INSTRUCTION (33, toplevel_set, "toplevel-set", 1, 1, 0) { unsigned objnum = FETCH (); SCM what; @@ -359,35 +410,7 @@ VM_DEFINE_INSTRUCTION (29, toplevel_set, "toplevel-set", 1, 1, 0) if (!SCM_VARIABLEP (what)) { SYNC_BEFORE_GC (); - if (SCM_LIKELY (SCM_SYMBOLP (what))) - { - SCM mod = SCM_EOL; - if (SCM_LIKELY (scm_module_system_booted_p - && scm_is_true ((mod = scm_program_module (program))))) - /* might longjmp */ - what = scm_module_lookup (mod, what); - else - what = scm_sym2var (what, SCM_BOOL_F, SCM_BOOL_F); - } - else - { - SCM mod; - /* compilation of @ or @@ - `what' is a three-element list: (MODNAME SYM INTERFACE?) - INTERFACE? is #t if we compiled @ or #f if we compiled @@ - */ - mod = scm_resolve_module (SCM_CAR (what)); - if (scm_is_true (SCM_CADDR (what))) - mod = scm_module_public_interface (mod); - if (SCM_FALSEP (mod)) - { - finish_args = SCM_LIST1 (what); - goto vm_error_no_such_module; - } - /* might longjmp */ - what = scm_module_lookup (mod, SCM_CADR (what)); - } - + what = resolve_variable (what, scm_program_module (program)); OBJECT_SET (objnum, what); } @@ -396,9 +419,24 @@ VM_DEFINE_INSTRUCTION (29, toplevel_set, "toplevel-set", 1, 1, 0) NEXT; } -VM_DEFINE_INSTRUCTION (30, externals, "externals", 0, 0, 1) +VM_DEFINE_INSTRUCTION (34, long_toplevel_set, "long-toplevel-set", 2, 1, 0) { - PUSH (external); + SCM what; + unsigned int objnum = FETCH (); + objnum <<= 8; + objnum += FETCH (); + CHECK_OBJECT (objnum); + what = OBJECT_REF (objnum); + + if (!SCM_VARIABLEP (what)) + { + SYNC_BEFORE_GC (); + what = resolve_variable (what, scm_program_module (program)); + OBJECT_SET (objnum, what); + } + + VARIABLE_SET (what, *sp); + DROP (); NEXT; } @@ -407,7 +445,7 @@ VM_DEFINE_INSTRUCTION (30, externals, "externals", 0, 0, 1) * branch and jump */ -/* offset must be a signed short!!! */ +/* offset must be a signed 16 bit int!!! */ #define FETCH_OFFSET(offset) \ { \ int h = FETCH (); \ @@ -417,49 +455,51 @@ VM_DEFINE_INSTRUCTION (30, externals, "externals", 0, 0, 1) #define BR(p) \ { \ - signed short offset; \ + scm_t_int16 offset; \ FETCH_OFFSET (offset); \ if (p) \ - ip += offset; \ + ip += ((scm_t_ptrdiff)offset) * 8 - (((unsigned long)ip) % 8); \ NULLSTACK (1); \ DROP (); \ NEXT; \ } -VM_DEFINE_INSTRUCTION (31, br, "br", 2, 0, 0) +VM_DEFINE_INSTRUCTION (35, br, "br", 2, 0, 0) { - int h = FETCH (); - int l = FETCH (); - ip += (signed short) (h << 8) + l; + scm_t_int16 offset; + FETCH_OFFSET (offset); + ip += ((scm_t_ptrdiff)offset) * 8 - (((unsigned long)ip) % 8); NEXT; } -VM_DEFINE_INSTRUCTION (32, br_if, "br-if", 2, 0, 0) +VM_DEFINE_INSTRUCTION (36, br_if, "br-if", 2, 0, 0) { BR (!SCM_FALSEP (*sp)); } -VM_DEFINE_INSTRUCTION (33, br_if_not, "br-if-not", 2, 0, 0) +VM_DEFINE_INSTRUCTION (37, br_if_not, "br-if-not", 2, 0, 0) { BR (SCM_FALSEP (*sp)); } -VM_DEFINE_INSTRUCTION (34, br_if_eq, "br-if-eq", 2, 0, 0) +VM_DEFINE_INSTRUCTION (38, br_if_eq, "br-if-eq", 2, 0, 0) { - BR (SCM_EQ_P (sp[0], sp--[1])); + sp--; /* underflow? */ + BR (SCM_EQ_P (sp[0], sp[1])); } -VM_DEFINE_INSTRUCTION (35, br_if_not_eq, "br-if-not-eq", 2, 0, 0) +VM_DEFINE_INSTRUCTION (39, br_if_not_eq, "br-if-not-eq", 2, 0, 0) { - BR (!SCM_EQ_P (sp[0], sp--[1])); + sp--; /* underflow? */ + BR (!SCM_EQ_P (sp[0], sp[1])); } -VM_DEFINE_INSTRUCTION (36, br_if_null, "br-if-null", 2, 0, 0) +VM_DEFINE_INSTRUCTION (40, br_if_null, "br-if-null", 2, 0, 0) { BR (SCM_NULLP (*sp)); } -VM_DEFINE_INSTRUCTION (37, br_if_not_null, "br-if-not-null", 2, 0, 0) +VM_DEFINE_INSTRUCTION (41, br_if_not_null, "br-if-not-null", 2, 0, 0) { BR (!SCM_NULLP (*sp)); } @@ -469,15 +509,7 @@ VM_DEFINE_INSTRUCTION (37, br_if_not_null, "br-if-not-null", 2, 0, 0) * Subprogram call */ -VM_DEFINE_INSTRUCTION (38, make_closure, "make-closure", 0, 1, 1) -{ - SYNC_BEFORE_GC (); - SCM_NEWSMOB3 (*sp, scm_tc16_program, SCM_PROGRAM_OBJCODE (*sp), - SCM_PROGRAM_OBJTABLE (*sp), external); - NEXT; -} - -VM_DEFINE_INSTRUCTION (39, call, "call", 1, -1, 1) +VM_DEFINE_INSTRUCTION (43, call, "call", 1, -1, 1) { SCM x; nargs = FETCH (); @@ -598,7 +630,7 @@ VM_DEFINE_INSTRUCTION (39, call, "call", 1, -1, 1) goto vm_error_wrong_type_apply; } -VM_DEFINE_INSTRUCTION (40, goto_args, "goto/args", 1, -1, 1) +VM_DEFINE_INSTRUCTION (44, goto_args, "goto/args", 1, -1, 1) { register SCM x; nargs = FETCH (); @@ -625,12 +657,6 @@ VM_DEFINE_INSTRUCTION (40, goto_args, "goto/args", 1, -1, 1) sp -= 2; NULLSTACK (bp->nargs + 1); - /* Freshen the externals */ - external = SCM_PROGRAM_EXTERNALS (x); - for (i = 0; i < bp->nexts; i++) - CONS (external, SCM_UNDEFINED, external); - SCM_FRAME_DATA_ADDRESS (fp)[0] = external; - /* Init locals to valid SCM values */ for (i = 0; i < bp->nlocs; i++) LOCAL_SET (i + bp->nargs, SCM_UNDEFINED); @@ -679,7 +705,7 @@ VM_DEFINE_INSTRUCTION (40, goto_args, "goto/args", 1, -1, 1) sure we have space for the locals now */ data = SCM_FRAME_DATA_ADDRESS (fp); ip = bp->base; - stack_base = data + 3; + stack_base = data + 2; sp = stack_base; CHECK_OVERFLOW (); @@ -694,17 +720,9 @@ VM_DEFINE_INSTRUCTION (40, goto_args, "goto/args", 1, -1, 1) data[-i] = SCM_UNDEFINED; /* Set frame data */ - data[3] = (SCM)ra; - data[2] = (SCM)mvra; - 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; + data[2] = (SCM)ra; + data[1] = (SCM)mvra; + data[0] = (SCM)dl; ENTER_HOOK (); APPLY_HOOK (); @@ -792,7 +810,7 @@ VM_DEFINE_INSTRUCTION (40, goto_args, "goto/args", 1, -1, 1) goto vm_error_wrong_type_apply; } -VM_DEFINE_INSTRUCTION (41, goto_nargs, "goto/nargs", 0, 0, 1) +VM_DEFINE_INSTRUCTION (45, goto_nargs, "goto/nargs", 0, 0, 1) { SCM x; POP (x); @@ -801,7 +819,7 @@ VM_DEFINE_INSTRUCTION (41, goto_nargs, "goto/nargs", 0, 0, 1) goto vm_goto_args; } -VM_DEFINE_INSTRUCTION (42, call_nargs, "call/nargs", 0, 0, 1) +VM_DEFINE_INSTRUCTION (46, call_nargs, "call/nargs", 0, 0, 1) { SCM x; POP (x); @@ -810,13 +828,15 @@ VM_DEFINE_INSTRUCTION (42, call_nargs, "call/nargs", 0, 0, 1) goto vm_call; } -VM_DEFINE_INSTRUCTION (43, mv_call, "mv-call", 3, -1, 1) +VM_DEFINE_INSTRUCTION (47, mv_call, "mv-call", 3, -1, 1) { SCM x; - signed short offset; + scm_t_int16 offset; + scm_t_uint8 *mvra; nargs = FETCH (); FETCH_OFFSET (offset); + mvra = ip + ((scm_t_ptrdiff)offset) * 8 - ((unsigned long)ip) % 8; x = sp[-nargs]; @@ -829,7 +849,7 @@ VM_DEFINE_INSTRUCTION (43, mv_call, "mv-call", 3, -1, 1) CACHE_PROGRAM (); INIT_ARGS (); NEW_FRAME (); - SCM_FRAME_DATA_ADDRESS (fp)[2] = (SCM)(SCM_FRAME_RETURN_ADDRESS (fp) + offset); + SCM_FRAME_DATA_ADDRESS (fp)[1] = (SCM)mvra; ENTER_HOOK (); APPLY_HOOK (); NEXT; @@ -854,7 +874,7 @@ VM_DEFINE_INSTRUCTION (43, mv_call, "mv-call", 3, -1, 1) len = scm_length (values); PUSH_LIST (values, SCM_NULLP); PUSH (len); - ip += offset; + ip = mvra; } NEXT; } @@ -871,7 +891,7 @@ VM_DEFINE_INSTRUCTION (43, mv_call, "mv-call", 3, -1, 1) goto vm_error_wrong_type_apply; } -VM_DEFINE_INSTRUCTION (44, apply, "apply", 1, -1, 1) +VM_DEFINE_INSTRUCTION (48, apply, "apply", 1, -1, 1) { int len; SCM ls; @@ -890,7 +910,7 @@ VM_DEFINE_INSTRUCTION (44, apply, "apply", 1, -1, 1) goto vm_call; } -VM_DEFINE_INSTRUCTION (45, goto_apply, "goto/apply", 1, -1, 1) +VM_DEFINE_INSTRUCTION (49, goto_apply, "goto/apply", 1, -1, 1) { int len; SCM ls; @@ -909,7 +929,7 @@ VM_DEFINE_INSTRUCTION (45, goto_apply, "goto/apply", 1, -1, 1) goto vm_goto_args; } -VM_DEFINE_INSTRUCTION (46, call_cc, "call/cc", 0, 1, 1) +VM_DEFINE_INSTRUCTION (50, call_cc, "call/cc", 0, 1, 1) { int first; SCM proc, cont; @@ -943,7 +963,7 @@ VM_DEFINE_INSTRUCTION (46, call_cc, "call/cc", 0, 1, 1) } } -VM_DEFINE_INSTRUCTION (47, goto_cc, "goto/cc", 0, 1, 1) +VM_DEFINE_INSTRUCTION (51, goto_cc, "goto/cc", 0, 1, 1) { int first; SCM proc, cont; @@ -975,7 +995,7 @@ VM_DEFINE_INSTRUCTION (47, goto_cc, "goto/cc", 0, 1, 1) } } -VM_DEFINE_INSTRUCTION (48, return, "return", 0, 1, 1) +VM_DEFINE_INSTRUCTION (52, return, "return", 0, 1, 1) { vm_return: EXIT_HOOK (); @@ -988,12 +1008,12 @@ VM_DEFINE_INSTRUCTION (48, return, "return", 0, 1, 1) POP (ret); ASSERT (sp == stack_base); - ASSERT (stack_base == data + 3); + ASSERT (stack_base == data + 2); /* Restore registers */ sp = SCM_FRAME_LOWER_ADDRESS (fp); - ip = SCM_FRAME_BYTE_CAST (data[3]); - fp = SCM_FRAME_STACK_CAST (data[1]); + ip = SCM_FRAME_BYTE_CAST (data[2]); + fp = SCM_FRAME_STACK_CAST (data[0]); { #ifdef VM_ENABLE_STACK_NULLING int nullcount = stack_base - sp; @@ -1009,12 +1029,11 @@ VM_DEFINE_INSTRUCTION (48, return, "return", 0, 1, 1) /* Restore the last program */ program = SCM_FRAME_PROGRAM (fp); CACHE_PROGRAM (); - CACHE_EXTERNAL (); CHECK_IP (); NEXT; } -VM_DEFINE_INSTRUCTION (49, return_values, "return/values", 1, -1, -1) +VM_DEFINE_INSTRUCTION (53, return_values, "return/values", 1, -1, -1) { /* nvalues declared at top level, because for some reason gcc seems to think that perhaps it might be used without declaration. Fooey to that, I say. */ @@ -1026,16 +1045,16 @@ VM_DEFINE_INSTRUCTION (49, return_values, "return/values", 1, -1, -1) RETURN_HOOK (); data = SCM_FRAME_DATA_ADDRESS (fp); - ASSERT (stack_base == data + 3); + ASSERT (stack_base == data + 2); - /* data[2] is the mv return address */ - if (nvalues != 1 && data[2]) + /* data[1] is the mv return address */ + if (nvalues != 1 && data[1]) { int i; /* Restore registers */ sp = SCM_FRAME_LOWER_ADDRESS (fp) - 1; - ip = SCM_FRAME_BYTE_CAST (data[2]); /* multiple value ra */ - fp = SCM_FRAME_STACK_CAST (data[1]); + ip = SCM_FRAME_BYTE_CAST (data[1]); /* multiple value ra */ + fp = SCM_FRAME_STACK_CAST (data[0]); /* Push return values, and the number of values */ for (i = 0; i < nvalues; i++) @@ -1054,8 +1073,8 @@ VM_DEFINE_INSTRUCTION (49, return_values, "return/values", 1, -1, -1) continuation.) */ /* Restore registers */ sp = SCM_FRAME_LOWER_ADDRESS (fp) - 1; - ip = SCM_FRAME_BYTE_CAST (data[3]); /* single value ra */ - fp = SCM_FRAME_STACK_CAST (data[1]); + ip = SCM_FRAME_BYTE_CAST (data[2]); /* single value ra */ + fp = SCM_FRAME_STACK_CAST (data[0]); /* Push first value */ *++sp = stack_base[1]; @@ -1070,12 +1089,11 @@ VM_DEFINE_INSTRUCTION (49, return_values, "return/values", 1, -1, -1) /* Restore the last program */ program = SCM_FRAME_PROGRAM (fp); CACHE_PROGRAM (); - CACHE_EXTERNAL (); CHECK_IP (); NEXT; } -VM_DEFINE_INSTRUCTION (50, return_values_star, "return/values*", 1, -1, -1) +VM_DEFINE_INSTRUCTION (54, return_values_star, "return/values*", 1, -1, -1) { SCM l; @@ -1098,7 +1116,7 @@ VM_DEFINE_INSTRUCTION (50, return_values_star, "return/values*", 1, -1, -1) goto vm_return_values; } -VM_DEFINE_INSTRUCTION (51, truncate_values, "truncate-values", 2, -1, -1) +VM_DEFINE_INSTRUCTION (55, truncate_values, "truncate-values", 2, -1, -1) { SCM x; int nbinds, rest; @@ -1121,6 +1139,142 @@ VM_DEFINE_INSTRUCTION (51, truncate_values, "truncate-values", 2, -1, -1) NEXT; } +VM_DEFINE_INSTRUCTION (56, box, "box", 1, 1, 0) +{ + SCM val; + POP (val); + SYNC_BEFORE_GC (); + LOCAL_SET (FETCH (), scm_cell (scm_tc7_variable, SCM_UNPACK (val))); + NEXT; +} + +/* for letrec: + (let ((a *undef*) (b *undef*) ...) + (set! a (lambda () (b ...))) + ...) + */ +VM_DEFINE_INSTRUCTION (57, empty_box, "empty-box", 1, 0, 0) +{ + SYNC_BEFORE_GC (); + LOCAL_SET (FETCH (), + scm_cell (scm_tc7_variable, SCM_UNPACK (SCM_UNDEFINED))); + NEXT; +} + +VM_DEFINE_INSTRUCTION (58, local_boxed_ref, "local-boxed-ref", 1, 0, 1) +{ + SCM v = LOCAL_REF (FETCH ()); + ASSERT_BOUND_VARIABLE (v); + PUSH (VARIABLE_REF (v)); + NEXT; +} + +VM_DEFINE_INSTRUCTION (59, local_boxed_set, "local-boxed-set", 1, 1, 0) +{ + SCM v, val; + v = LOCAL_REF (FETCH ()); + POP (val); + ASSERT_VARIABLE (v); + VARIABLE_SET (v, val); + NEXT; +} + +VM_DEFINE_INSTRUCTION (60, free_ref, "free-ref", 1, 0, 1) +{ + scm_t_uint8 idx = FETCH (); + + CHECK_FREE_VARIABLE (idx); + PUSH (FREE_VARIABLE_REF (idx)); + NEXT; +} + +/* no free-set -- if a var is assigned, it should be in a box */ + +VM_DEFINE_INSTRUCTION (61, free_boxed_ref, "free-boxed-ref", 1, 0, 1) +{ + SCM v; + scm_t_uint8 idx = FETCH (); + CHECK_FREE_VARIABLE (idx); + v = FREE_VARIABLE_REF (idx); + ASSERT_BOUND_VARIABLE (v); + PUSH (VARIABLE_REF (v)); + NEXT; +} + +VM_DEFINE_INSTRUCTION (62, free_boxed_set, "free-boxed-set", 1, 1, 0) +{ + SCM v, val; + scm_t_uint8 idx = FETCH (); + POP (val); + CHECK_FREE_VARIABLE (idx); + v = FREE_VARIABLE_REF (idx); + ASSERT_BOUND_VARIABLE (v); + VARIABLE_SET (v, val); + NEXT; +} + +VM_DEFINE_INSTRUCTION (63, make_closure, "make-closure", 0, 2, 1) +{ + SCM vect; + POP (vect); + SYNC_BEFORE_GC (); + /* fixme underflow */ + SCM_NEWSMOB3 (*sp, scm_tc16_program, SCM_PROGRAM_OBJCODE (*sp), + SCM_PROGRAM_OBJTABLE (*sp), vect); + NEXT; +} + +VM_DEFINE_INSTRUCTION (64, make_variable, "make-variable", 0, 0, 1) +{ + SYNC_BEFORE_GC (); + /* fixme underflow */ + PUSH (scm_cell (scm_tc7_variable, SCM_UNPACK (SCM_UNDEFINED))); + NEXT; +} + +VM_DEFINE_INSTRUCTION (65, fix_closure, "fix-closure", 2, 0, 1) +{ + SCM x, vect; + unsigned int i = FETCH (); + i <<= 8; + i += FETCH (); + POP (vect); + /* FIXME CHECK_LOCAL (i) */ + x = LOCAL_REF (i); + /* FIXME ASSERT_PROGRAM (x); */ + SCM_SET_CELL_WORD_3 (x, vect); + NEXT; +} + +VM_DEFINE_INSTRUCTION (66, define, "define", 0, 0, 2) +{ + SCM sym, val; + POP (sym); + POP (val); + SYNC_REGISTER (); + VARIABLE_SET (scm_sym2var (sym, scm_current_module_lookup_closure (), + SCM_BOOL_T), + val); + NEXT; +} + +VM_DEFINE_INSTRUCTION (67, make_keyword, "make-keyword", 0, 1, 1) +{ + CHECK_UNDERFLOW (); + SYNC_REGISTER (); + *sp = scm_symbol_to_keyword (*sp); + NEXT; +} + +VM_DEFINE_INSTRUCTION (68, make_symbol, "make-symbol", 0, 1, 1) +{ + CHECK_UNDERFLOW (); + SYNC_REGISTER (); + *sp = scm_string_to_symbol (*sp); + NEXT; +} + + /* (defun renumber-ops () "start from top of buffer and renumber 'VM_DEFINE_FOO (\n' sequences" |