diff options
Diffstat (limited to 'libguile')
-rw-r--r-- | libguile/vm-engine.c | 4 | ||||
-rw-r--r-- | libguile/vm-engine.h | 8 | ||||
-rw-r--r-- | libguile/vm-i-system.c | 1 | ||||
-rw-r--r-- | libguile/vm.c | 21 | ||||
-rw-r--r-- | libguile/vm.h | 3 |
5 files changed, 0 insertions, 37 deletions
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c index 2f3320c29..7fbb77480 100644 --- a/libguile/vm-engine.c +++ b/libguile/vm-engine.c @@ -20,12 +20,10 @@ #if (VM_ENGINE == SCM_VM_REGULAR_ENGINE) #define VM_USE_HOOKS 0 /* Various hooks */ -#define VM_USE_CLOCK 0 /* Bogoclock */ #define VM_CHECK_OBJECT 1 /* Check object table */ #define VM_CHECK_FREE_VARIABLES 1 /* Check free variable access */ #elif (VM_ENGINE == SCM_VM_DEBUG_ENGINE) #define VM_USE_HOOKS 1 -#define VM_USE_CLOCK 1 #define VM_CHECK_OBJECT 1 #define VM_CHECK_FREE_VARIABLES 1 #else @@ -53,7 +51,6 @@ VM_NAME (struct scm_vm *vp, SCM program, SCM *argv, int nargs) /* Internal variables */ int nvalues = 0; - long start_time = scm_c_get_internal_run_time (); SCM finish_args; /* used both for returns: both in error and normal situations */ #if VM_USE_HOOKS @@ -255,7 +252,6 @@ VM_NAME (struct scm_vm *vp, SCM program, SCM *argv, int nargs) } #undef VM_USE_HOOKS -#undef VM_USE_CLOCK #undef VM_CHECK_OBJECT #undef VM_CHECK_FREE_VARIABLE diff --git a/libguile/vm-engine.h b/libguile/vm-engine.h index 838ed202e..949e9c473 100644 --- a/libguile/vm-engine.h +++ b/libguile/vm-engine.h @@ -339,13 +339,6 @@ do { \ #define FETCH() (*ip++) #define FETCH_LENGTH(len) do { len=*ip++; len<<=8; len+=*ip++; len<<=8; len+=*ip++; } while (0) -#undef CLOCK -#if VM_USE_CLOCK -#define CLOCK(n) vp->clock += n -#else -#define CLOCK(n) -#endif - #undef NEXT_JUMP #ifdef HAVE_LABELS_AS_VALUES #define NEXT_JUMP() goto *jump_table[FETCH () & SCM_VM_INSTRUCTION_MASK] @@ -355,7 +348,6 @@ do { \ #define NEXT \ { \ - CLOCK (1); \ NEXT_HOOK (); \ CHECK_STACK_LEAK (); \ NEXT_JUMP (); \ diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c index 41874fae3..102c1d791 100644 --- a/libguile/vm-i-system.c +++ b/libguile/vm-i-system.c @@ -31,7 +31,6 @@ VM_DEFINE_INSTRUCTION (0, nop, "nop", 0, 0, 0) VM_DEFINE_INSTRUCTION (1, halt, "halt", 0, 0, 0) { - vp->time += scm_c_get_internal_run_time () - start_time; HALT_HOOK (); nvalues = SCM_I_INUM (*sp--); NULLSTACK (1); diff --git a/libguile/vm.c b/libguile/vm.c index 0e511f608..c7ece1158 100644 --- a/libguile/vm.c +++ b/libguile/vm.c @@ -363,8 +363,6 @@ make_vm (void) vp->sp = vp->stack_base - 1; vp->fp = NULL; vp->engine = SCM_VM_DEBUG_ENGINE; - vp->time = 0; - vp->clock = 0; vp->options = SCM_EOL; for (i = 0; i < SCM_VM_NUM_HOOKS; i++) vp->hooks[i] = SCM_BOOL_F; @@ -621,25 +619,6 @@ SCM_DEFINE (scm_set_vm_option_x, "set-vm-option!", 3, 0, 0, } #undef FUNC_NAME -SCM_DEFINE (scm_vm_stats, "vm-stats", 1, 0, 0, - (SCM vm), - "") -#define FUNC_NAME s_scm_vm_stats -{ - SCM stats; - - SCM_VALIDATE_VM (1, vm); - - stats = scm_make_vector (SCM_I_MAKINUM (2), SCM_UNSPECIFIED); - scm_vector_set_x (stats, SCM_I_MAKINUM (0), - scm_from_ulong (SCM_VM_DATA (vm)->time)); - scm_vector_set_x (stats, SCM_I_MAKINUM (1), - scm_from_ulong (SCM_VM_DATA (vm)->clock)); - - return stats; -} -#undef FUNC_NAME - SCM_DEFINE (scm_vm_trace_frame, "vm-trace-frame", 1, 0, 0, (SCM vm), "") diff --git a/libguile/vm.h b/libguile/vm.h index 9479ba709..cbd0c5546 100644 --- a/libguile/vm.h +++ b/libguile/vm.h @@ -50,8 +50,6 @@ struct scm_vm { int engine; /* which vm engine we're using */ SCM hooks[SCM_VM_NUM_HOOKS]; /* hooks */ SCM options; /* options */ - unsigned long time; /* time spent */ - unsigned long clock; /* bogos clock */ SCM trace_frame; /* a frame being traced */ }; @@ -85,7 +83,6 @@ SCM_API SCM scm_vm_exit_hook (SCM vm); SCM_API SCM scm_vm_return_hook (SCM vm); SCM_API SCM scm_vm_option (SCM vm, SCM key); SCM_API SCM scm_set_vm_option_x (SCM vm, SCM key, SCM val); -SCM_API SCM scm_vm_stats (SCM vm); SCM_API SCM scm_vm_trace_frame (SCM vm); struct scm_vm_cont { |