diff options
-rw-r--r-- | libguile/programs.c | 4 | ||||
-rw-r--r-- | libguile/vm.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libguile/programs.c b/libguile/programs.c index a5f540ac8..675035727 100644 --- a/libguile/programs.c +++ b/libguile/programs.c @@ -1,4 +1,4 @@ -/* Copyright 2001,2009-2014,2017-2018 +/* Copyright 2001,2009-2014,2017-2019 Free Software Foundation, Inc. This file is part of Guile. @@ -60,7 +60,7 @@ scm_i_program_name (SCM program) static SCM program_name = SCM_BOOL_F; if (SCM_PRIMITIVE_P (program)) - return SCM_SUBR_NAME (program); + return scm_i_primitive_name (SCM_PROGRAM_CODE (program)); if (scm_is_false (program_name) && scm_module_system_booted_p) program_name = diff --git a/libguile/vm.c b/libguile/vm.c index d6b76f9fe..e9e6ad0c4 100644 --- a/libguile/vm.c +++ b/libguile/vm.c @@ -1,4 +1,4 @@ -/* Copyright 2001,2009-2015,2017-2018 +/* Copyright 2001,2009-2015,2017-2019 Free Software Foundation, Inc. This file is part of Guile. @@ -484,7 +484,9 @@ define_vm_builtins (void) { \ size_t sz = sizeof (builtin##_code); \ vm_builtin_##builtin##_code = instrumented_code (builtin##_code, sz); \ - vm_builtin_##builtin = scm_i_make_program (vm_builtin_##builtin##_code); \ + vm_builtin_##builtin = \ + scm_cell (scm_tc7_program | SCM_F_PROGRAM_IS_PRIMITIVE, \ + (scm_t_bits)vm_builtin_##builtin##_code); \ } FOR_EACH_VM_BUILTIN (DEFINE_BUILTIN); #undef INDEX_TO_NAME |