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

Parse bytecode to determine minimum arity

Browse source 
* libguile/programs.c (try_parse_arity): New helper, to parse bytecode
  to determine the minimum arity of a function in a cheaper way than
  grovelling through the debug info.  Should speed up all thunk? checks
  and similar.
  (scm_i_program_arity): Simplify.
* libguile/gsubr.h:
* libguile/gsubr.c (scm_i_primitive_arity):
* libguile/foreign.h:
* libguile/foreign.c (scm_i_foreign_arity):
This commit is contained in:
Andy Wingo 2016-06-24 14:15:38 +02:00
parent 5ca24b6ba1
commit d848af9a16
5 changed files with 58 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

71
libguile/programs.c
View file

@ -22,6 +22,7 @@
#include <string.h>
#include "_scm.h"
#include "instructions.h"
#include "modules.h"
#include "programs.h"
#include "procprop.h" /* scm_sym_name */
@ -236,25 +237,69 @@ SCM_DEFINE (scm_program_free_variable_set_x, "program-free-variable-set!", 3, 0,
}
#undef FUNC_NAME
/* It's hacky, but it manages to cover all of the non-keyword cases. */
static int
try_parse_arity (SCM program, int *req, int *opt, int *rest)
{
scm_t_uint32 *code = SCM_PROGRAM_CODE (program);
scm_t_uint32 slots, min;
switch (code[0] & 0xff) {
case scm_op_assert_nargs_ee:
slots = code[0] >> 8;
*req = slots - 1;
*opt = 0;
*rest = 0;
return 1;
case scm_op_assert_nargs_le:
slots = code[0] >> 8;
*req = 0;
*opt = slots - 1;
*rest = 0;
return 1;
case scm_op_bind_rest:
slots = code[0] >> 8;
*req = 0;
*opt = slots - 1;
*rest = 1;
return 1;
case scm_op_assert_nargs_ge:
min = code[0] >> 8;
switch (code[1] & 0xff) {
case scm_op_assert_nargs_le:
slots = code[1] >> 8;
*req = min - 1;
*opt = slots - 1 - *req;
*rest = 0;
return 1;
case scm_op_bind_rest:
slots = code[1] >> 8;
*req = min - 1;
*opt = slots - min;
*rest = 1;
return 1;
default:
return 0;
}
case scm_op_continuation_call:
case scm_op_compose_continuation:
*req = 0;
*opt = 0;
*rest = 1;
return 1;
default:
return 0;
}
}
int
scm_i_program_arity (SCM program, int *req, int *opt, int *rest)
{
static SCM program_minimum_arity = SCM_BOOL_F;
SCM l;
if (SCM_PRIMITIVE_P (program))
return scm_i_primitive_arity (program, req, opt, rest);
if (SCM_PROGRAM_IS_FOREIGN (program))
return scm_i_foreign_arity (program, req, opt, rest);
if (SCM_PROGRAM_IS_CONTINUATION (program)
|| SCM_PROGRAM_IS_PARTIAL_CONTINUATION (program))
{
*req = *opt = 0;
*rest = 1;
return 1;
}
if (try_parse_arity (program, req, opt, rest))
return 1;
if (scm_is_false (program_minimum_arity) && scm_module_system_booted_p)
program_minimum_arity =