mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 20:00:19 +02:00
Code Activity

VM robustness for optimized closures

Browse source 
* libguile/vm.c (vm_error_unbound, vm_error_unbound_fluid): Remove proc
  argument.  The value in slot 0 is not necessarily the procedure being
  applied, after the prelude is done.

* libguile/vm-engine.c (vm_engine): Use LOCAL_REF (0) instead of
  SCM_FRAME_PROGRAM, and adapt to above changes.
This commit is contained in:
Andy Wingo 2014-04-16 19:20:23 +02:00
parent a2ebdba7ac
commit 73fc4e73e4
2 changed files with 31 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

52
libguile/vm-engine.c
View file

@ -457,9 +457,9 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
NEXT (0); NEXT (0);
apply: apply:
while (!SCM_PROGRAM_P (SCM_FRAME_PROGRAM (fp))) while (!SCM_PROGRAM_P (LOCAL_REF (0)))
{ {
SCM proc = SCM_FRAME_PROGRAM (fp); SCM proc = LOCAL_REF (0);
if (SCM_STRUCTP (proc) && SCM_STRUCT_APPLICABLE_P (proc)) if (SCM_STRUCTP (proc) && SCM_STRUCT_APPLICABLE_P (proc))
{ {
@ -484,7 +484,7 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
} }
/* Let's go! */ /* Let's go! */
ip = SCM_PROGRAM_CODE (SCM_FRAME_PROGRAM (fp)); ip = SCM_PROGRAM_CODE (LOCAL_REF (0));
NEXT (0); NEXT (0);
BEGIN_DISPATCH_SWITCH; BEGIN_DISPATCH_SWITCH;
@ -558,10 +558,10 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
PUSH_CONTINUATION_HOOK (); PUSH_CONTINUATION_HOOK ();
APPLY_HOOK (); APPLY_HOOK ();
if (SCM_UNLIKELY (!SCM_PROGRAM_P (SCM_FRAME_PROGRAM (fp)))) if (SCM_UNLIKELY (!SCM_PROGRAM_P (LOCAL_REF (0))))
goto apply; goto apply;
ip = SCM_PROGRAM_CODE (SCM_FRAME_PROGRAM (fp)); ip = SCM_PROGRAM_CODE (LOCAL_REF (0));
NEXT (0); NEXT (0);
} }
@ -618,10 +618,10 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
APPLY_HOOK (); APPLY_HOOK ();
if (SCM_UNLIKELY (!SCM_PROGRAM_P (SCM_FRAME_PROGRAM (fp)))) if (SCM_UNLIKELY (!SCM_PROGRAM_P (LOCAL_REF (0))))
goto apply; goto apply;
ip = SCM_PROGRAM_CODE (SCM_FRAME_PROGRAM (fp)); ip = SCM_PROGRAM_CODE (LOCAL_REF (0));
NEXT (0); NEXT (0);
} }
@ -672,10 +672,10 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
APPLY_HOOK (); APPLY_HOOK ();
if (SCM_UNLIKELY (!SCM_PROGRAM_P (SCM_FRAME_PROGRAM (fp)))) if (SCM_UNLIKELY (!SCM_PROGRAM_P (LOCAL_REF (0))))
goto apply; goto apply;
ip = SCM_PROGRAM_CODE (SCM_FRAME_PROGRAM (fp)); ip = SCM_PROGRAM_CODE (LOCAL_REF (0));
NEXT (0); NEXT (0);
} }
@ -961,10 +961,10 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
APPLY_HOOK (); APPLY_HOOK ();
if (SCM_UNLIKELY (!SCM_PROGRAM_P (SCM_FRAME_PROGRAM (fp)))) if (SCM_UNLIKELY (!SCM_PROGRAM_P (LOCAL_REF (0))))
goto apply; goto apply;
ip = SCM_PROGRAM_CODE (SCM_FRAME_PROGRAM (fp)); ip = SCM_PROGRAM_CODE (LOCAL_REF (0));
NEXT (0); NEXT (0);
} }
@ -1005,10 +1005,10 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
APPLY_HOOK (); APPLY_HOOK ();
if (SCM_UNLIKELY (!SCM_PROGRAM_P (SCM_FRAME_PROGRAM (fp)))) if (SCM_UNLIKELY (!SCM_PROGRAM_P (LOCAL_REF (0))))
goto apply; goto apply;
ip = SCM_PROGRAM_CODE (SCM_FRAME_PROGRAM (fp)); ip = SCM_PROGRAM_CODE (LOCAL_REF (0));
NEXT (0); NEXT (0);
} }
else else
@ -1096,7 +1096,7 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
scm_t_uint32 expected; scm_t_uint32 expected;
UNPACK_24 (op, expected); UNPACK_24 (op, expected);
VM_ASSERT (FRAME_LOCALS_COUNT () == expected, VM_ASSERT (FRAME_LOCALS_COUNT () == expected,
vm_error_wrong_num_args (SCM_FRAME_PROGRAM (fp))); vm_error_wrong_num_args (LOCAL_REF (0)));
NEXT (1); NEXT (1);
} }
VM_DEFINE_OP (22, assert_nargs_ge, "assert-nargs-ge", OP1 (U8_U24)) VM_DEFINE_OP (22, assert_nargs_ge, "assert-nargs-ge", OP1 (U8_U24))
@ -1104,7 +1104,7 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
scm_t_uint32 expected; scm_t_uint32 expected;
UNPACK_24 (op, expected); UNPACK_24 (op, expected);
VM_ASSERT (FRAME_LOCALS_COUNT () >= expected, VM_ASSERT (FRAME_LOCALS_COUNT () >= expected,
vm_error_wrong_num_args (SCM_FRAME_PROGRAM (fp))); vm_error_wrong_num_args (LOCAL_REF (0)));
NEXT (1); NEXT (1);
} }
VM_DEFINE_OP (23, assert_nargs_le, "assert-nargs-le", OP1 (U8_U24)) VM_DEFINE_OP (23, assert_nargs_le, "assert-nargs-le", OP1 (U8_U24))
@ -1112,7 +1112,7 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
scm_t_uint32 expected; scm_t_uint32 expected;
UNPACK_24 (op, expected); UNPACK_24 (op, expected);
VM_ASSERT (FRAME_LOCALS_COUNT () <= expected, VM_ASSERT (FRAME_LOCALS_COUNT () <= expected,
vm_error_wrong_num_args (SCM_FRAME_PROGRAM (fp))); vm_error_wrong_num_args (LOCAL_REF (0)));
NEXT (1); NEXT (1);
} }
@ -1159,7 +1159,7 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
scm_t_uint16 expected, nlocals; scm_t_uint16 expected, nlocals;
UNPACK_12_12 (op, expected, nlocals); UNPACK_12_12 (op, expected, nlocals);
VM_ASSERT (FRAME_LOCALS_COUNT () == expected, VM_ASSERT (FRAME_LOCALS_COUNT () == expected,
vm_error_wrong_num_args (SCM_FRAME_PROGRAM (fp))); vm_error_wrong_num_args (LOCAL_REF (0)));
ALLOC_FRAME (expected + nlocals); ALLOC_FRAME (expected + nlocals);
while (nlocals--) while (nlocals--)
LOCAL_SET (expected + nlocals, SCM_UNDEFINED); LOCAL_SET (expected + nlocals, SCM_UNDEFINED);
@ -1258,7 +1258,7 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
LOCAL_SET (n++, SCM_UNDEFINED); LOCAL_SET (n++, SCM_UNDEFINED);
VM_ASSERT (has_rest || (nkw % 2) == 0, VM_ASSERT (has_rest || (nkw % 2) == 0,
vm_error_kwargs_length_not_even (SCM_FRAME_PROGRAM (fp))); vm_error_kwargs_length_not_even (LOCAL_REF (0)));
/* Now bind keywords, in the order given. */ /* Now bind keywords, in the order given. */
for (n = 0; n < nkw; n++) for (n = 0; n < nkw; n++)
@ -1274,12 +1274,12 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
break; break;
} }
VM_ASSERT (scm_is_pair (walk) || allow_other_keys, VM_ASSERT (scm_is_pair (walk) || allow_other_keys,
vm_error_kwargs_unrecognized_keyword (SCM_FRAME_PROGRAM (fp), vm_error_kwargs_unrecognized_keyword (LOCAL_REF (0),
LOCAL_REF (ntotal + n))); LOCAL_REF (ntotal + n)));
n++; n++;
} }
else else
VM_ASSERT (has_rest, vm_error_kwargs_invalid_keyword (SCM_FRAME_PROGRAM (fp), VM_ASSERT (has_rest, vm_error_kwargs_invalid_keyword (LOCAL_REF (0),
LOCAL_REF (ntotal + n))); LOCAL_REF (ntotal + n)));
if (has_rest) if (has_rest)
@ -1555,8 +1555,7 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
var = LOCAL_REF (src); var = LOCAL_REF (src);
VM_ASSERT (SCM_VARIABLEP (var), VM_ASSERT (SCM_VARIABLEP (var),
vm_error_not_a_variable ("variable-ref", var)); vm_error_not_a_variable ("variable-ref", var));
VM_ASSERT (VARIABLE_BOUNDP (var), VM_ASSERT (VARIABLE_BOUNDP (var), vm_error_unbound (var));
vm_error_unbound (SCM_FRAME_PROGRAM (fp), var));
LOCAL_SET (dst, VARIABLE_REF (var)); LOCAL_SET (dst, VARIABLE_REF (var));
NEXT (1); NEXT (1);
} }
@ -1870,8 +1869,7 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
var = scm_lookup (LOCAL_REF (sym)); var = scm_lookup (LOCAL_REF (sym));
CACHE_FP (); CACHE_FP ();
if (ip[1] & 0x1) if (ip[1] & 0x1)
VM_ASSERT (VARIABLE_BOUNDP (var), VM_ASSERT (VARIABLE_BOUNDP (var), vm_error_unbound (LOCAL_REF (sym)));
vm_error_unbound (fp[0], LOCAL_REF (sym)));
LOCAL_SET (dst, var); LOCAL_SET (dst, var);
NEXT (2); NEXT (2);
@ -1950,7 +1948,7 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
var = scm_module_lookup (mod, sym); var = scm_module_lookup (mod, sym);
CACHE_FP (); CACHE_FP ();
if (ip[4] & 0x1) if (ip[4] & 0x1)
VM_ASSERT (VARIABLE_BOUNDP (var), vm_error_unbound (fp[0], sym)); VM_ASSERT (VARIABLE_BOUNDP (var), vm_error_unbound (sym));
*var_loc = var; *var_loc = var;
} }
@ -2012,7 +2010,7 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
CACHE_FP (); CACHE_FP ();
if (ip[4] & 0x1) if (ip[4] & 0x1)
VM_ASSERT (VARIABLE_BOUNDP (var), vm_error_unbound (fp[0], sym)); VM_ASSERT (VARIABLE_BOUNDP (var), vm_error_unbound (sym));
*var_loc = var; *var_loc = var;
} }
@ -2141,7 +2139,7 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
if (scm_is_eq (val, SCM_UNDEFINED)) if (scm_is_eq (val, SCM_UNDEFINED))
val = SCM_I_FLUID_DEFAULT (fluid); val = SCM_I_FLUID_DEFAULT (fluid);
VM_ASSERT (!scm_is_eq (val, SCM_UNDEFINED), VM_ASSERT (!scm_is_eq (val, SCM_UNDEFINED),
vm_error_unbound_fluid (SCM_FRAME_PROGRAM (fp), fluid)); vm_error_unbound_fluid (fluid));
LOCAL_SET (dst, val); LOCAL_SET (dst, val);
} }

12
libguile/vm.c
View file

@ -462,8 +462,8 @@ vm_reinstate_partial_continuation (struct scm_vm *vp, SCM cont,
static void vm_error (const char *msg, SCM arg) SCM_NORETURN; static void vm_error (const char *msg, SCM arg) SCM_NORETURN;
static void vm_error_bad_instruction (scm_t_uint32 inst) SCM_NORETURN SCM_NOINLINE; static void vm_error_bad_instruction (scm_t_uint32 inst) SCM_NORETURN SCM_NOINLINE;
static void vm_error_unbound (SCM proc, SCM sym) SCM_NORETURN SCM_NOINLINE; static void vm_error_unbound (SCM sym) SCM_NORETURN SCM_NOINLINE;
static void vm_error_unbound_fluid (SCM proc, SCM fluid) SCM_NORETURN SCM_NOINLINE; static void vm_error_unbound_fluid (SCM fluid) SCM_NORETURN SCM_NOINLINE;
static void vm_error_not_a_variable (const char *func_name, SCM x) SCM_NORETURN SCM_NOINLINE; static void vm_error_not_a_variable (const char *func_name, SCM x) SCM_NORETURN SCM_NOINLINE;
static void vm_error_apply_to_non_list (SCM x) SCM_NORETURN SCM_NOINLINE; static void vm_error_apply_to_non_list (SCM x) SCM_NORETURN SCM_NOINLINE;
static void vm_error_kwargs_length_not_even (SCM proc) SCM_NORETURN SCM_NOINLINE; static void vm_error_kwargs_length_not_even (SCM proc) SCM_NORETURN SCM_NOINLINE;
@ -501,17 +501,17 @@ vm_error_bad_instruction (scm_t_uint32 inst)
} }
static void static void
vm_error_unbound (SCM proc, SCM sym) vm_error_unbound (SCM sym)
{ {
scm_error_scm (scm_misc_error_key, proc, scm_error_scm (scm_misc_error_key, SCM_BOOL_F,
scm_from_latin1_string ("Unbound variable: ~s"), scm_from_latin1_string ("Unbound variable: ~s"),
scm_list_1 (sym), SCM_BOOL_F); scm_list_1 (sym), SCM_BOOL_F);
} }
static void static void
vm_error_unbound_fluid (SCM proc, SCM fluid) vm_error_unbound_fluid (SCM fluid)
{ {
scm_error_scm (scm_misc_error_key, proc, scm_error_scm (scm_misc_error_key, SCM_BOOL_F,
scm_from_latin1_string ("Unbound fluid: ~s"), scm_from_latin1_string ("Unbound fluid: ~s"),
scm_list_1 (fluid), SCM_BOOL_F); scm_list_1 (fluid), SCM_BOOL_F);
} }