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/frames.h | |
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/frames.h')
-rw-r--r-- | libguile/frames.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libguile/frames.h b/libguile/frames.h index 3d8a4b27a..47244c7a3 100644 --- a/libguile/frames.h +++ b/libguile/frames.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2009, 2010 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2009, 2010, 2011 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 @@ -70,15 +70,15 @@ #define SCM_FRAME_RETURN_ADDRESS(fp) \ (SCM_FRAME_BYTE_CAST (SCM_FRAME_DATA_ADDRESS (fp)[2])) #define SCM_FRAME_SET_RETURN_ADDRESS(fp, ra) \ - ((SCM_FRAME_DATA_ADDRESS (fp)[2])) = (SCM)(ra); + ((SCM_FRAME_DATA_ADDRESS (fp)[2])) = SCM_PACK (ra) #define SCM_FRAME_MV_RETURN_ADDRESS(fp) \ (SCM_FRAME_BYTE_CAST (SCM_FRAME_DATA_ADDRESS (fp)[1])) #define SCM_FRAME_SET_MV_RETURN_ADDRESS(fp, mvra) \ - ((SCM_FRAME_DATA_ADDRESS (fp)[1])) = (SCM)(mvra); + ((SCM_FRAME_DATA_ADDRESS (fp)[1])) = SCM_PACK (mvra) #define SCM_FRAME_DYNAMIC_LINK(fp) \ (SCM_FRAME_STACK_CAST (SCM_FRAME_DATA_ADDRESS (fp)[0])) #define SCM_FRAME_SET_DYNAMIC_LINK(fp, dl) \ - ((SCM_FRAME_DATA_ADDRESS (fp)[0])) = (SCM)(dl); + ((SCM_FRAME_DATA_ADDRESS (fp)[0])) = SCM_PACK (dl) #define SCM_FRAME_VARIABLE(fp,i) SCM_FRAME_STACK_ADDRESS (fp)[i] #define SCM_FRAME_PROGRAM(fp) SCM_FRAME_STACK_ADDRESS (fp)[-1] |