mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-11 06:20:23 +02:00
Code Activity

Remove last use of SCM vm

Browse source 
* libguile/threads.h (scm_i_thread): Hold a struct scm_vm*, not a SCM
  vm.
* libguile/threads.c (guilify_self_2):
* libguile/vm.c (make_vm): Adapt.
This commit is contained in:
Andy Wingo 2013-11-21 18:33:06 +01:00
parent e7f9ababe0
commit 3506b1521e
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libguile/threads.c
View file

@ -614,7 +614,7 @@ guilify_self_2 (SCM parent)
t->continuation_root = scm_cons (t->handle, SCM_EOL); t->continuation_root = scm_cons (t->handle, SCM_EOL);
t->continuation_base = t->base; t->continuation_base = t->base;
t->vm = SCM_BOOL_F; t->vp = NULL;
if (scm_is_true (parent)) if (scm_is_true (parent))
t->dynamic_state = scm_make_dynamic_state (parent); t->dynamic_state = scm_make_dynamic_state (parent);

2
libguile/threads.h
View file

@ -110,7 +110,7 @@ typedef struct scm_i_thread {
SCM_STACKITEM *continuation_base; SCM_STACKITEM *continuation_base;
/* For keeping track of the stack and registers. */ /* For keeping track of the stack and registers. */
SCM vm; struct scm_vm *vp;
SCM_STACKITEM *base; SCM_STACKITEM *base;
scm_i_jmp_buf regs; scm_i_jmp_buf regs;
#ifdef __ia64__ #ifdef __ia64__

11
libguile/vm.c
View file

@ -748,7 +748,7 @@ static int vm_stack_gc_kind;
#endif #endif
static SCM static struct scm_vm *
make_vm (void) make_vm (void)
#define FUNC_NAME "make_vm" #define FUNC_NAME "make_vm"
{ {
@ -781,7 +781,8 @@ make_vm (void)
vp->trace_level = 0; vp->trace_level = 0;
for (i = 0; i < SCM_VM_NUM_HOOKS; i++) for (i = 0; i < SCM_VM_NUM_HOOKS; i++)
vp->hooks[i] = SCM_BOOL_F; vp->hooks[i] = SCM_BOOL_F;
return scm_cell (scm_tc7_vm, (scm_t_bits)vp);
return vp;
} }
#undef FUNC_NAME #undef FUNC_NAME
@ -829,10 +830,10 @@ scm_the_vm (void)
{ {
scm_i_thread *t = SCM_I_CURRENT_THREAD; scm_i_thread *t = SCM_I_CURRENT_THREAD;
if (SCM_UNLIKELY (scm_is_false (t->vm))) if (SCM_UNLIKELY (!t->vp))
t->vm = make_vm (); t->vp = make_vm ();
return SCM_VM_DATA (t->vm); return t->vp;
} }
/* Scheme interface */ /* Scheme interface */