diff options
author | Andy Wingo <wingo@pobox.com> | 2009-09-27 19:25:58 -0400 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-10-23 14:51:17 +0200 |
commit | 6c6a44390b841d716042e845bf4133fbf987cc9f (patch) | |
tree | 5970db9091966a7be8417b2fa0948f21db72eb9a /libguile/vm-i-system.c | |
parent | 1e2a8c266d720a5dca97a96e5cde860a9d934ad6 (diff) | |
download | guile-6c6a44390b841d716042e845bf4133fbf987cc9f.tar.gz |
runtime and debugging support for callee-parsed procedure args
* libguile/objcodes.h: Bump for metadata format change.
* libguile/frames.h: Rework so we don't frob the program's nargs, nlocs,
etc at runtime. Instead we don't really know what's a local var, an
argument, or an intermediate value. It's a little unfortunate, but
this will allow for case-lambda, and eventually for good polymorphic
generic dispatch; and the nlocs etc can be heuristically
reconstructed. Such a reconstruction would be better done at the
Scheme level, though.
(SCM_FRAME_STACK_ADDRESS): New macro, the pointer to the base of the
stack elements (not counting the program).
(SCM_FRAME_UPPER_ADDRESS): Repurpose to be the address of the last
element in the bookkeeping part of the stack -- i.e. to point to the
return address.
* libguile/vm-engine.h:
* libguile/vm-i-system.c: Adapt to removal of stack_base. Though we
still detect stack-smashing underflow, we don't do so as precisely as
we did before, because now we only detect overwriting of the frame
metadata.
* libguile/vm-engine.c (vm_engine): Remove the stack_base variable. It
is unnecessary, and difficult to keep track of in the face of
case-lambda. Also fix miscommented "ra" and "mvra" pushes. Push the
vp->ip as the first ra...
* libguile/vm-i-system.c (halt): ...because here we can restore the
vp->ip instead of setting ip to 0. Allows us to introspect ips all
down the stack, including in recursive VM invocations.
* libguile/frames.h:
* libguile/frames.c (scm_vm_frame_stack): Removed, because it's getting
more difficult to tell what's an argument and what's a temporary stack
element.
(scm_vm_frame_num_locals): New accessor.
(scm_vm_frame_instruction_pointer): New accessor.
(scm_vm_frame_arguments): Defer to an implementation in Scheme.
(scm_vm_frame_num_locals scm_vm_frame_local_ref)
(scm_vm_frame_local_set_x): Since we can get not-yet-active frames on
the stack now, with our current calling convention, we have to add a
heuristic here to jump over those frames -- because frames have
pointers in them, not Scheme values.
* libguile/programs.h:
* libguile/programs.c (scm_program_arity): Remove, in favor of..
(scm_program_arities): ...this, which a list of arities, in a new
format, occupying a slot in the metadata.
* module/language/assembly/decompile-bytecode.scm (decode-load-program):
Fix mv-call decompilation.
* module/system/vm/frame.scm (vm-frame-bindings, vm-frame-binding-ref)
(vm-frame-binding-set!): New functions, to access bindings by name in
a frame.
(vm-frame-arguments): Function now implemented in Scheme. Commented
fairly extensively.
* module/system/vm/program.scm (program-bindings-by-index)
(program-bindings-for-ip): New accessors, parsing the program bindings
metadata into something more useful.
(program-arities, program-arguments): In a case-lambda world, we have
to assume that programs can have multiple arities. But it's tough to
detect this algorithmically; instead we're going to require that the
program metadata include information about the arities, and the parts
of the program that that metadata applies to.
(program-lambda-list): New accessor.
(write-program): Show multiple arities.
* module/language/glil/compile-assembly.scm (glil->assembly): Add
"arities" to the state of the compiler, and add arities entries as
appropriate.
Diffstat (limited to 'libguile/vm-i-system.c')
-rw-r--r-- | libguile/vm-i-system.c | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c index ab901e281..244f23ab7 100644 --- a/libguile/vm-i-system.c +++ b/libguile/vm-i-system.c @@ -46,14 +46,18 @@ VM_DEFINE_INSTRUCTION (1, halt, "halt", 0, 0, 0) } { - ASSERT (sp == stack_base); - ASSERT (stack_base == SCM_FRAME_UPPER_ADDRESS (fp) - 1); +#ifdef VM_ENABLE_STACK_NULLING + SCM *old_sp = sp; +#endif /* Restore registers */ sp = SCM_FRAME_LOWER_ADDRESS (fp) - 1; - ip = NULL; + /* Setting the ip here doesn't actually affect control flow, as the calling + code will restore its own registers, but it does help when walking the + stack */ + ip = SCM_FRAME_RETURN_ADDRESS (fp); fp = SCM_FRAME_DYNAMIC_LINK (fp); - NULLSTACK (stack_base - sp); + NULLSTACK (old_sp - sp); } goto vm_done; @@ -517,6 +521,8 @@ VM_DEFINE_INSTRUCTION (40, push_rest_list, "push-rest-list", 2, -1, -1) VM_DEFINE_INSTRUCTION (41, new_frame, "new-frame", 0, 0, 3) { + /* NB: if you change this, see frames.c:vm-frame-num-locals */ + /* and frames.h, vm-engine.c, etc of course */ PUSH ((SCM)fp); /* dynamic link */ PUSH (0); /* mvra */ PUSH (0); /* ra */ @@ -863,20 +869,19 @@ VM_DEFINE_INSTRUCTION (51, return, "return", 0, 1, 1) SCM ret; POP (ret); - ASSERT (sp == stack_base); - ASSERT (stack_base == SCM_FRAME_UPPER_ADDRESS (fp) - 1); + +#ifdef VM_ENABLE_STACK_NULLING + SCM *old_sp = sp; +#endif /* Restore registers */ sp = SCM_FRAME_LOWER_ADDRESS (fp); ip = SCM_FRAME_RETURN_ADDRESS (fp); fp = SCM_FRAME_DYNAMIC_LINK (fp); - { + #ifdef VM_ENABLE_STACK_NULLING - int nullcount = stack_base - sp; + NULLSTACK (old_sp - sp); #endif - stack_base = SCM_FRAME_UPPER_ADDRESS (fp) - 1; - NULLSTACK (nullcount); - } /* Set return value (sp is already pushed) */ *sp = ret; @@ -898,11 +903,10 @@ VM_DEFINE_INSTRUCTION (52, return_values, "return/values", 1, -1, -1) EXIT_HOOK (); RETURN_HOOK (); - ASSERT (stack_base == SCM_FRAME_UPPER_ADDRESS (fp) - 1); - - /* data[1] is the mv return address */ if (nvalues != 1 && SCM_FRAME_MV_RETURN_ADDRESS (fp)) { + /* A multiply-valued continuation */ + SCM *vals = sp - nvalues; int i; /* Restore registers */ sp = SCM_FRAME_LOWER_ADDRESS (fp) - 1; @@ -911,12 +915,11 @@ VM_DEFINE_INSTRUCTION (52, return_values, "return/values", 1, -1, -1) /* Push return values, and the number of values */ for (i = 0; i < nvalues; i++) - *++sp = stack_base[1+i]; + *++sp = vals[i+1]; *++sp = SCM_I_MAKINUM (nvalues); - /* Finally set new stack_base */ - NULLSTACK (stack_base - sp + nvalues + 1); - stack_base = SCM_FRAME_UPPER_ADDRESS (fp) - 1; + /* Finally null the end of the stack */ + NULLSTACK (vals + nvalues - sp); } else if (nvalues >= 1) { @@ -924,17 +927,17 @@ VM_DEFINE_INSTRUCTION (52, return_values, "return/values", 1, -1, -1) break with guile tradition and try and do something sensible. (Also, this block handles the single-valued return to an mv continuation.) */ + SCM *vals = sp - nvalues; /* Restore registers */ sp = SCM_FRAME_LOWER_ADDRESS (fp) - 1; ip = SCM_FRAME_RETURN_ADDRESS (fp); fp = SCM_FRAME_DYNAMIC_LINK (fp); /* Push first value */ - *++sp = stack_base[1]; + *++sp = vals[1]; - /* Finally set new stack_base */ - NULLSTACK (stack_base - sp + nvalues + 1); - stack_base = SCM_FRAME_UPPER_ADDRESS (fp) - 1; + /* Finally null the end of the stack */ + NULLSTACK (vals + nvalues - sp); } else goto vm_error_no_values; |