mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
* libguile/backtrace.c (print_exception_var): New static variable. (init_print_exception_var): New static function. (scm_print_exception): Remove thread-unsafe lazy initialization. Call 'init_print_exception_var' using 'scm_i_pthread_once'. Use 'print_exception_var'. * libguile/continuations.c (call_cc): New static variable. (init_call_cc): New static function. (scm_i_call_with_current_continuation): Remove thread-unsafe lazy initialization. Call 'init_call_cc' using 'scm_i_pthread_once'. * libguile/debug.c (local_eval_var): New static variable. (init_local_eval_var): New static function. (scm_local_eval): Remove lazy initialization using mutexes. Call 'init_local_eval_var' using 'scm_i_pthread_once'. Use 'scm_variable_ref' instead of 'SCM_VARIABLE_REF'. * libguile/eval.c (map_var, for_each_var): New static variables. (init_map_var, init_for_each_var): New static functions. (scm_map, scm_for_each): Remove thread-unsafe lazy initializations. Call 'init_map_var' (or 'init_for_each_var') using 'scm_i_pthread_once'. Use 'map_var' (or 'for_each_var'). * libguile/frames.c (frame_arguments_var): New static variable. (init_frame_arguments_var): New static function. (scm_frame_arguments): Remove thread-unsafe lazy initialization. Call 'init_frame_arguments_var' using 'scm_i_pthread_once'. Use 'frame_arguments_var'. Use 'scm_variable_ref' instead of 'SCM_VARIABLE_REF'. * libguile/goops.c (delayed_compile_var): New static variable. (init_delayed_compile_var): New static function. (make_dispatch_procedure): Remove thread-unsafe lazy initialization. Call 'init_delayed_compile_var' using 'scm_i_pthread_once'. Use 'delayed_compile_var'. Use 'scm_variable_ref' instead of 'SCM_VARIABLE_REF'. * libguile/instructions.c (instructions_by_name): New static variable. (init_instructions_by_name): New static function. (scm_lookup_instruction_by_name): Remove thread-unsafe lazy initialization. Call 'init_instructions_by_name' using 'scm_i_pthread_once'. * libguile/ports.c (current_warning_port_var) (current_warning_port_once): New static variables. (init_current_warning_port_var): New static function. (scm_current_warning_port): Remove lazy initialization using mutexes. Call 'init_current_warning_port_var' using 'scm_i_pthread_once'. Use 'current_warning_port_var'. (scm_set_current_warning_port): Remove thread-unsafe lazy initialization. Call 'init_current_warning_port_var' using 'scm_i_pthread_once'. Use 'current_warning_port_var'. * libguile/strings.c (null_stringbuf): New static variable. (init_null_stringbuf): New static function. (scm_i_make_string): Remove thread-unsafe lazy initialization. Call 'init_null_stringbuf' using 'scm_i_pthread_once'. * libguile/strports.c (eval_string_var, k_module): New static variables. (init_eval_string_var_and_k_module): New static function. (scm_eval_string_in_module): Remove lazy initialization using mutexes. Call 'init_eval_string_var_and_k_module' using 'scm_i_pthread_once'. Use 'eval_string_var'. * libguile/throw.c (CACHE_VAR): Remove incorrect macro. (catch_var, throw_var, with_throw_handler_var): New static variables. (scm_catch, scm_catch_with_pre_unwind_handler): Remove thread-unsafe lazy initialization. Use 'catch_var'. (init_with_throw_handler_var): New static function. (scm_with_throw_handler): Remove thread-unsafe lazy initialization. Call 'init_with_throw_handler_var' using 'scm_i_pthread_once'. Use 'with_throw_handler_var'. (scm_throw): Remove thread-unsafe lazy initialization. Use 'throw_var'. (scm_init_throw): Initialize 'catch_var' and 'throw_var'.
231 lines
6.1 KiB
C
231 lines
6.1 KiB
C
/* 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
|
|
* as published by the Free Software Foundation; either version 3 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
* 02110-1301 USA
|
|
*/
|
|
|
|
#if HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <string.h>
|
|
|
|
#include "_scm.h"
|
|
#include "threads.h"
|
|
#include "instructions.h"
|
|
|
|
|
|
struct scm_instruction {
|
|
enum scm_opcode opcode; /* opcode */
|
|
const char *name; /* instruction name */
|
|
signed char len; /* Instruction length. This may be -1 for
|
|
the loader (see the `VM_LOADER'
|
|
macro). */
|
|
signed char npop; /* The number of values popped. This may be
|
|
-1 for insns like `call' which can take
|
|
any number of arguments. */
|
|
char npush; /* the number of values pushed */
|
|
SCM symname; /* filled in later */
|
|
};
|
|
|
|
#define SCM_VALIDATE_LOOKUP_INSTRUCTION(pos, var, cvar) \
|
|
do { \
|
|
cvar = scm_lookup_instruction_by_name (var); \
|
|
SCM_ASSERT_TYPE (cvar, var, pos, FUNC_NAME, "INSTRUCTION_P"); \
|
|
} while (0)
|
|
|
|
|
|
static scm_i_pthread_mutex_t itable_lock = SCM_I_PTHREAD_MUTEX_INITIALIZER;
|
|
|
|
|
|
static struct scm_instruction*
|
|
fetch_instruction_table ()
|
|
{
|
|
static struct scm_instruction *table = NULL;
|
|
|
|
scm_i_pthread_mutex_lock (&itable_lock);
|
|
if (SCM_UNLIKELY (!table))
|
|
{
|
|
size_t bytes = SCM_VM_NUM_INSTRUCTIONS * sizeof(struct scm_instruction);
|
|
int i;
|
|
table = malloc (bytes);
|
|
memset (table, 0, bytes);
|
|
#define VM_INSTRUCTION_TO_TABLE 1
|
|
#include <libguile/vm-expand.h>
|
|
#include <libguile/vm-i-system.i>
|
|
#include <libguile/vm-i-scheme.i>
|
|
#include <libguile/vm-i-loader.i>
|
|
#undef VM_INSTRUCTION_TO_TABLE
|
|
for (i = 0; i < SCM_VM_NUM_INSTRUCTIONS; i++)
|
|
{
|
|
table[i].opcode = i;
|
|
if (table[i].name)
|
|
table[i].symname = scm_from_locale_symbol (table[i].name);
|
|
else
|
|
table[i].symname = SCM_BOOL_F;
|
|
}
|
|
}
|
|
scm_i_pthread_mutex_unlock (&itable_lock);
|
|
|
|
return table;
|
|
}
|
|
|
|
static SCM instructions_by_name;
|
|
|
|
static void
|
|
init_instructions_by_name (void)
|
|
{
|
|
struct scm_instruction *table = fetch_instruction_table ();
|
|
unsigned int i;
|
|
|
|
instructions_by_name =
|
|
scm_make_hash_table (SCM_I_MAKINUM (SCM_VM_NUM_INSTRUCTIONS));
|
|
|
|
for (i = 0; i < SCM_VM_NUM_INSTRUCTIONS; i++)
|
|
if (scm_is_true (table[i].symname))
|
|
scm_hashq_set_x (instructions_by_name, table[i].symname,
|
|
SCM_I_MAKINUM (i));
|
|
}
|
|
|
|
static struct scm_instruction *
|
|
scm_lookup_instruction_by_name (SCM name)
|
|
{
|
|
static scm_i_pthread_once_t once = SCM_I_PTHREAD_ONCE_INIT;
|
|
struct scm_instruction *table = fetch_instruction_table ();
|
|
SCM op;
|
|
|
|
scm_i_pthread_once (&once, init_instructions_by_name);
|
|
|
|
op = scm_hashq_ref (instructions_by_name, name, SCM_UNDEFINED);
|
|
if (SCM_I_INUMP (op))
|
|
return &table[SCM_I_INUM (op)];
|
|
|
|
return NULL;
|
|
}
|
|
|
|
|
|
/* Scheme interface */
|
|
|
|
SCM_DEFINE (scm_instruction_list, "instruction-list", 0, 0, 0,
|
|
(void),
|
|
"")
|
|
#define FUNC_NAME s_scm_instruction_list
|
|
{
|
|
SCM list = SCM_EOL;
|
|
int i;
|
|
struct scm_instruction *ip = fetch_instruction_table ();
|
|
for (i = 0; i < SCM_VM_NUM_INSTRUCTIONS; i++)
|
|
if (ip[i].name)
|
|
list = scm_cons (ip[i].symname, list);
|
|
return scm_reverse_x (list, SCM_EOL);
|
|
}
|
|
#undef FUNC_NAME
|
|
|
|
SCM_DEFINE (scm_instruction_p, "instruction?", 1, 0, 0,
|
|
(SCM obj),
|
|
"")
|
|
#define FUNC_NAME s_scm_instruction_p
|
|
{
|
|
return scm_from_bool (scm_lookup_instruction_by_name (obj) != NULL);
|
|
}
|
|
#undef FUNC_NAME
|
|
|
|
SCM_DEFINE (scm_instruction_length, "instruction-length", 1, 0, 0,
|
|
(SCM inst),
|
|
"")
|
|
#define FUNC_NAME s_scm_instruction_length
|
|
{
|
|
struct scm_instruction *ip;
|
|
SCM_VALIDATE_LOOKUP_INSTRUCTION (1, inst, ip);
|
|
return SCM_I_MAKINUM (ip->len);
|
|
}
|
|
#undef FUNC_NAME
|
|
|
|
SCM_DEFINE (scm_instruction_pops, "instruction-pops", 1, 0, 0,
|
|
(SCM inst),
|
|
"")
|
|
#define FUNC_NAME s_scm_instruction_pops
|
|
{
|
|
struct scm_instruction *ip;
|
|
SCM_VALIDATE_LOOKUP_INSTRUCTION (1, inst, ip);
|
|
return SCM_I_MAKINUM (ip->npop);
|
|
}
|
|
#undef FUNC_NAME
|
|
|
|
SCM_DEFINE (scm_instruction_pushes, "instruction-pushes", 1, 0, 0,
|
|
(SCM inst),
|
|
"")
|
|
#define FUNC_NAME s_scm_instruction_pushes
|
|
{
|
|
struct scm_instruction *ip;
|
|
SCM_VALIDATE_LOOKUP_INSTRUCTION (1, inst, ip);
|
|
return SCM_I_MAKINUM (ip->npush);
|
|
}
|
|
#undef FUNC_NAME
|
|
|
|
SCM_DEFINE (scm_instruction_to_opcode, "instruction->opcode", 1, 0, 0,
|
|
(SCM inst),
|
|
"")
|
|
#define FUNC_NAME s_scm_instruction_to_opcode
|
|
{
|
|
struct scm_instruction *ip;
|
|
SCM_VALIDATE_LOOKUP_INSTRUCTION (1, inst, ip);
|
|
return SCM_I_MAKINUM (ip->opcode);
|
|
}
|
|
#undef FUNC_NAME
|
|
|
|
SCM_DEFINE (scm_opcode_to_instruction, "opcode->instruction", 1, 0, 0,
|
|
(SCM op),
|
|
"")
|
|
#define FUNC_NAME s_scm_opcode_to_instruction
|
|
{
|
|
scm_t_signed_bits opcode;
|
|
SCM ret = SCM_BOOL_F;
|
|
|
|
SCM_MAKE_VALIDATE (1, op, I_INUMP);
|
|
opcode = SCM_I_INUM (op);
|
|
|
|
if (opcode >= 0 && opcode < SCM_VM_NUM_INSTRUCTIONS)
|
|
ret = fetch_instruction_table ()[opcode].symname;
|
|
|
|
if (scm_is_false (ret))
|
|
scm_wrong_type_arg_msg (FUNC_NAME, 1, op, "INSTRUCTION_P");
|
|
|
|
return ret;
|
|
}
|
|
#undef FUNC_NAME
|
|
|
|
void
|
|
scm_bootstrap_instructions (void)
|
|
{
|
|
scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION,
|
|
"scm_init_instructions",
|
|
(scm_t_extension_init_func)scm_init_instructions,
|
|
NULL);
|
|
}
|
|
|
|
void
|
|
scm_init_instructions (void)
|
|
{
|
|
#ifndef SCM_MAGIC_SNARFER
|
|
#include "libguile/instructions.x"
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
Local Variables:
|
|
c-file-style: "gnu"
|
|
End:
|
|
*/
|