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

less overhead for handling interrupts in the vm

Browse source 
* libguile/__scm.h (SCM_ASYNC_TICK): Add some branch prediction.
  (SCM_ASYNC_TICK_WITH_CODE): New helper for when BUILDING_LIBGUILE,
  runs code only if we're going to call async_click().
* libguile/vm-engine.h (VM_HANDLE_INTERRUPTS): New helper, uses
  SCM_ASYNC_TICK_WITH_CODE to only save regs if we'll handle an
  interrupt.
* libguile/vm-i-system.c (call, goto/args, return): use
  VM_HANDLE_INTERRUPTS.
This commit is contained in:
Andy Wingo 2009-12-11 11:15:12 +01:00
parent aa3819aa34
commit e8c3777214
3 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
libguile/__scm.h
View file

@ -498,12 +498,24 @@ SCM_API void scm_async_tick (void);
#ifdef BUILDING_LIBGUILE #ifdef BUILDING_LIBGUILE
/* FIXME: should change names */ /* FIXME: should change names */
# define SCM_ASYNC_TICK \ # define SCM_ASYNC_TICK \
do \ do \
{ \ { \
if (SCM_I_CURRENT_THREAD->pending_asyncs) \ if (SCM_UNLIKELY (SCM_I_CURRENT_THREAD->pending_asyncs)) \
scm_async_click (); \ scm_async_click (); \
} \ } \
while (0)
/* SCM_ASYNC_TICK_WITH_CODE is only available to Guile itself */
# define SCM_ASYNC_TICK_WITH_CODE(stmt) \
do \
{ \
if (SCM_UNLIKELY (SCM_I_CURRENT_THREAD->pending_asyncs)) \
{ \
stmt; \
scm_async_click (); \
} \
} \
while (0) while (0)
#else /* !BUILDING_LIBGUILE */ #else /* !BUILDING_LIBGUILE */

3
libguile/vm-engine.h
View file

@ -228,6 +228,9 @@
#define EXIT_HOOK() RUN_HOOK (SCM_VM_EXIT_HOOK) #define EXIT_HOOK() RUN_HOOK (SCM_VM_EXIT_HOOK)
#define RETURN_HOOK() RUN_HOOK (SCM_VM_RETURN_HOOK) #define RETURN_HOOK() RUN_HOOK (SCM_VM_RETURN_HOOK)
#define VM_HANDLE_INTERRUPTS \
SCM_ASYNC_TICK_WITH_CODE (SYNC_REGISTER ())
/* /*
* Stack operation * Stack operation

11
libguile/vm-i-system.c
View file

@ -747,8 +747,7 @@ VM_DEFINE_INSTRUCTION (54, call, "call", 1, -1, 1)
vm_call: vm_call:
x = sp[-nargs]; x = sp[-nargs];
SYNC_REGISTER (); VM_HANDLE_INTERRUPTS;
SCM_TICK; /* allow interrupt here */
/* /*
* Subprogram call * Subprogram call
@ -813,8 +812,7 @@ VM_DEFINE_INSTRUCTION (55, goto_args, "goto/args", 1, -1, 1)
vm_goto_args: vm_goto_args:
x = sp[-nargs]; x = sp[-nargs];
SYNC_REGISTER (); VM_HANDLE_INTERRUPTS;
SCM_TICK; /* allow interrupt here */
/* /*
* Tail call * Tail call
@ -1085,8 +1083,9 @@ VM_DEFINE_INSTRUCTION (63, return, "return", 0, 1, 1)
vm_return: vm_return:
EXIT_HOOK (); EXIT_HOOK ();
RETURN_HOOK (); RETURN_HOOK ();
SYNC_REGISTER ();
SCM_TICK; /* allow interrupt here */ VM_HANDLE_INTERRUPTS;
{ {
SCM ret; SCM ret;