diff options
author | Andy Wingo <wingo@pobox.com> | 2011-05-13 12:51:56 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-05-13 15:28:08 +0200 |
commit | b2b33168b18c6c4fd65b0e77becba1a66a00dae1 (patch) | |
tree | ca47dc70a7a4f2f7d59b78cb9db2435cd3d98640 /libguile/vm-engine.c | |
parent | d223c3fcdde81280ea8fb9a4b05897786014bbce (diff) | |
download | guile-b2b33168b18c6c4fd65b0e77becba1a66a00dae1.tar.gz |
more care regarding SCM_PACK and SCM_UNPACK
* libguile/control.c (reify_partial_continuation):
* libguile/eval.c (RETURN_BOOT_CLOSURE):
* libguile/frames.c (scm_frame_num_locals, scm_frame_local_ref)
(scm_frame_local_set_x)
* libguile/frames.h (SCM_FRAME_SET_RETURN_ADDRESS):
(SCM_FRAME_SET_MV_RETURN_ADDRESS, SCM_FRAME_SET_DYNAMIC_LINK):
* libguile/goops.c (scm_class_of, scm_primitive_generic_generic)
(scm_c_extend_primitive_generic, compute_getters_n_setters)
(scm_sys_initialize_object):
* libguile/guardians.c (finalize_guarded):
* libguile/list.c (SCM_I_CONS):
* libguile/macros.c (scm_i_make_primitive_macro)
(scm_make_syntax_transformer):
* libguile/memoize.c (MAKMEMO, SCM_MAKE_MEMOIZER)
(SCM_MAKE_REST_MEMOIZER):
* libguile/modules.c (scm_module_reverse_lookup)
* libguile/print.c (iprin1):
* libguile/promises.c (scm_make_promise)
* libguile/srcprop.c (scm_make_srcprops):
* libguile/vectors.c (scm_c_vector_ref):
* libguile/vm-engine.c (vm_engine)
* libguile/vm-i-scheme.c (REL, add1, sub1):
* libguile/vm-i-system.c (new_frame, call_cc)
* libguile/weaks.h (SCM_WEAK_PAIR_WORD_DELETED_P): Be more careful about
SCM_PACK / SCM_UNPACK.
Diffstat (limited to 'libguile/vm-engine.c')
-rw-r--r-- | libguile/vm-engine.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c index e449b4372..22bd39c0e 100644 --- a/libguile/vm-engine.c +++ b/libguile/vm-engine.c @@ -89,17 +89,17 @@ VM_NAME (SCM vm, SCM program, SCM *argv, int nargs) /* Initial frame */ CACHE_REGISTER (); - PUSH ((SCM)fp); /* dynamic link */ - PUSH (0); /* mvra */ - PUSH ((SCM)ip); /* ra */ + PUSH (SCM_PACK (fp)); /* dynamic link */ + PUSH (SCM_PACK (0)); /* mvra */ + PUSH (SCM_PACK (ip)); /* ra */ CACHE_PROGRAM (); PUSH (program); fp = sp + 1; ip = SCM_C_OBJCODE_BASE (bp); /* MV-call frame, function & arguments */ - PUSH (0); /* dynamic link */ - PUSH (0); /* mvra */ - PUSH (0); /* ra */ + PUSH (SCM_PACK (0)); /* dynamic link */ + PUSH (SCM_PACK (0)); /* mvra */ + PUSH (SCM_PACK (0)); /* ra */ PUSH (prog); if (SCM_UNLIKELY (sp + nargs >= stack_limit)) goto vm_error_too_many_args; |