1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 03:30:27 +02:00

Remove scm_tc7_vm

* libguile/tags.h (scm_tc7_vm): Return to pool.

* libguile/goops.c:
* libguile/gc.c (scm_i_tag_name):
* libguile/evalext.c (scm_self_evaluating_p):
* libguile/print.c (iprin1): Remove tc7_vm things.

* libguile/vm.h (scm_the_vm_fluid): Remove stray declaration.  Remove
  SCM_VM_P.  Remove SCM_VM_DATA.  Remove SCM_VALIDATE_VM.
* libguile/vm.c (scm_i_vm_print): Remove.
This commit is contained in:
Andy Wingo 2013-11-21 18:37:52 +01:00
parent 3506b1521e
commit 350930756c
7 changed files with 1 additions and 52 deletions

View file

@ -81,7 +81,6 @@ SCM_DEFINE (scm_self_evaluating_p, "self-evaluating?", 1, 0, 0,
case scm_tc7_fluid:
case scm_tc7_dynamic_state:
case scm_tc7_frame:
case scm_tc7_vm:
case scm_tc7_vm_cont:
case scm_tc7_number:
case scm_tc7_string:

View file

@ -944,8 +944,6 @@ scm_i_tag_name (scm_t_bits tag)
return "dynamic state";
case scm_tc7_frame:
return "frame";
case scm_tc7_vm:
return "vm";
case scm_tc7_vm_cont:
return "vm continuation";
case scm_tc7_wvect:

View file

@ -155,7 +155,6 @@ static SCM class_hashtable;
static SCM class_fluid;
static SCM class_dynamic_state;
static SCM class_frame;
static SCM class_vm;
static SCM class_vm_cont;
static SCM class_bytevector;
static SCM class_uvec;
@ -265,8 +264,6 @@ SCM_DEFINE (scm_class_of, "class-of", 1, 0, 0,
return class_dynamic_state;
case scm_tc7_frame:
return class_frame;
case scm_tc7_vm:
return class_vm;
case scm_tc7_vm_cont:
return class_vm_cont;
case scm_tc7_bytevector:
@ -2512,8 +2509,6 @@ create_standard_classes (void)
scm_class_class, scm_class_top, SCM_EOL);
make_stdcls (&class_frame, "<frame>",
scm_class_class, scm_class_top, SCM_EOL);
make_stdcls (&class_vm, "<vm>",
scm_class_class, scm_class_top, SCM_EOL);
make_stdcls (&class_vm_cont, "<vm-continuation>",
scm_class_class, scm_class_top, SCM_EOL);
make_stdcls (&class_bytevector, "<bytevector>",

View file

@ -684,9 +684,6 @@ iprin1 (SCM exp, SCM port, scm_print_state *pstate)
case scm_tc7_frame:
scm_i_frame_print (exp, port, pstate);
break;
case scm_tc7_vm:
scm_i_vm_print (exp, port, pstate);
break;
case scm_tc7_vm_cont:
scm_i_vm_cont_print (exp, port, pstate);
break;

View file

@ -424,7 +424,7 @@ typedef union SCM { struct { scm_t_bits n; } n; } SCM;
#define scm_tc7_frame 47
#define scm_tc7_unused_53 53
#define scm_tc7_vm 55
#define scm_tc7_unused_55 55
#define scm_tc7_vm_cont 71
#define scm_tc7_unused_17 61

View file

@ -365,36 +365,6 @@ vm_reinstate_partial_continuation (struct scm_vm *vp, SCM cont,
#undef RELOC
}
/*
* VM Internal functions
*/
void
scm_i_vm_print (SCM x, SCM port, scm_print_state *pstate)
{
const struct scm_vm *vm;
vm = SCM_VM_DATA (x);
scm_puts_unlocked ("#<vm ", port);
switch (vm->engine)
{
case SCM_VM_REGULAR_ENGINE:
scm_puts_unlocked ("regular-engine ", port);
break;
case SCM_VM_DEBUG_ENGINE:
scm_puts_unlocked ("debug-engine ", port);
break;
default:
scm_puts_unlocked ("unknown-engine ", port);
}
scm_uintprint (SCM_UNPACK (x), 16, port);
scm_puts_unlocked (">", port);
}
/*
* VM Error Handling

View file

@ -32,8 +32,6 @@ enum {
SCM_VM_NUM_HOOKS,
};
struct scm_vm;
#define SCM_VM_REGULAR_ENGINE 0
#define SCM_VM_DEBUG_ENGINE 1
#define SCM_VM_NUM_ENGINES 2
@ -50,12 +48,6 @@ struct scm_vm {
int engine; /* which vm engine we're using */
};
SCM_API SCM scm_the_vm_fluid;
#define SCM_VM_P(x) (SCM_HAS_TYP7 (x, scm_tc7_vm))
#define SCM_VM_DATA(vm) ((struct scm_vm *) SCM_CELL_WORD_1 (vm))
#define SCM_VALIDATE_VM(pos,x) SCM_MAKE_VALIDATE (pos, x, VM_P)
SCM_INTERNAL struct scm_vm *scm_the_vm (void);
SCM_API SCM scm_call_with_vm (SCM proc, SCM args);
@ -94,8 +86,6 @@ struct scm_vm_cont {
SCM_API SCM scm_load_compiled_with_vm (SCM file);
SCM_INTERNAL void scm_i_vm_print (SCM x, SCM port,
scm_print_state *pstate);
SCM_INTERNAL SCM scm_i_call_with_current_continuation (SCM proc);
SCM_INTERNAL SCM scm_i_capture_current_stack (void);
SCM_INTERNAL SCM scm_i_vm_capture_stack (SCM *stack_base, SCM *fp, SCM *sp,