mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-11 22:31:12 +02:00
b1b942b74c
* doc/ref/vm.texi (Stack Layout): Update to remove references to the "heap link". * gdbinit: Update for "heap link" removal. * libguile/frames.c: * libguile/frames.h: Update macros and diagram for removal of "heap link". As part of this, we also remove "heap frames", replacing them with "vm frames", which are much like the interpreter's debug objects, but for VM stacks. That is to say, they don't actually hold the stack themselves, just the pointers into stack that's held by a continuation (either captured or current). * libguile/stacks.c (stack_depth, read_frames): Since a "stack" object is really a copy of information that comes from somewhere else, it makes sense to copy over info from the VM, just as `make-stack' does from the evaluator. The tricky bit is to figure out how to interleave VM and interpreter frames. We do that by starting in the interpreter, and whenever the current frame's procedure is actually a program, we switch to the VM stack, switching back when we reach a "bootstrap frame". The last bit is hacky, but it does work... (is_vm_bootstrap_frame): Hacky predicate to see if a VM frame is a bootstrap frame. (scm_make_stack): Accept a VM frame in addition to debug frames. Probably has some bugs in this case. But in the case that the arg is #t (a common case), do the right thing, capturing the top VM frame as well, and interleaving those frames appropriately on the stack. As an accident, we lost the ability to limit the number of frames in the backtrace. We could add that back, but personally I always want *all* frames in the trace... Narrowing still works fine, though there are some hiccups sometimes -- e.g. an outer cut to a procedure that does a tail-call in VM code will never find the cut, as it no longer exists in the continuation. * libguile/vm.h (struct scm_vm): So! Now that we have switched to save stacks in the normal make-stack, there's no more need for `this_frame' or `last_frame'. On the other hand, we can take this opportunity to fix tracing: when we're in a trace hook, we set `trace_frame' on the VM, so we know not to fire hooks when we're already in a hook. (struct scm_vm_cont): Expose this, as make-stack needs it to make VM frames from VM continuations. * libguile/vm.c (scm_vm_trace_frame): New function, gets the current trace frame. (vm_mark, make_vm): Hook up the trace frame. (vm_dispatch_hook): New hook dispatcher, with a dynwind so it does the right thing if the hook exits nonlocally. * libguile/vm-engine.c (vm_run): No more this_frame in the wind data. * libguile/vm-engine.h (RUN_HOOK): Run hooks through the dispatcher. (ALIGN_AS_NON_IMMEDIATE, POP_LIST_ON_STACK): Remove unused code. (NEW_FRAME): Adapt for no HL in the frame. * libguile/vm-i-system.c (goto/args, mv-call, return, return/values): Adapt for no HL in the frame. * module/system/vm/frame.scm: * module/system/vm/vm.scm: Beginnings of some reworkings, needs more thought.
200 lines
3 KiB
Text
200 lines
3 KiB
Text
# -*- GDB-Script -*-
|
|
|
|
define newline
|
|
call (void)scm_newline (scm_current_error_port ())
|
|
end
|
|
|
|
define pp
|
|
call (void)scm_call_1 (scm_variable_ref (scm_c_module_lookup (scm_c_resolve_module ("ice-9 pretty-print"), "pretty-print")), $arg0)
|
|
end
|
|
|
|
define gdisplay
|
|
call (void)scm_display ($arg0, scm_current_error_port ())
|
|
newline
|
|
end
|
|
|
|
define gwrite
|
|
call (void)scm_write ($arg0, scm_current_error_port ())
|
|
newline
|
|
end
|
|
|
|
define sputs
|
|
call (void)scm_puts ($arg0, scm_current_error_port ())
|
|
end
|
|
|
|
define gslot
|
|
print ((SCM**)$arg0)[1][$arg1]
|
|
end
|
|
|
|
define pslot
|
|
gslot $arg0 $arg1
|
|
gwrite $
|
|
end
|
|
|
|
define lforeach
|
|
set $l=$arg0
|
|
while $l != 0x404
|
|
set $x=scm_car($l)
|
|
$arg1 $x
|
|
set $l = scm_cdr($l)
|
|
end
|
|
end
|
|
|
|
define modsum
|
|
modname $arg0
|
|
gslot $arg0 1
|
|
set $uses=$
|
|
output "uses:\n"
|
|
lforeach $uses modname
|
|
end
|
|
|
|
define moduses
|
|
pslot $arg0 1
|
|
end
|
|
|
|
define modname
|
|
pslot $arg0 5
|
|
end
|
|
|
|
define modkind
|
|
pslot $arg0 6
|
|
end
|
|
|
|
define car
|
|
call scm_car ($arg0)
|
|
end
|
|
|
|
define cdr
|
|
call scm_cdr ($arg0)
|
|
end
|
|
|
|
define smobwordtox
|
|
set $x=((SCM*)$arg0)[$arg1]
|
|
end
|
|
|
|
define smobdatatox
|
|
smobwordtox $arg0 1
|
|
end
|
|
|
|
define program
|
|
smobdatatox $arg0
|
|
p *(struct scm_program*)$x
|
|
end
|
|
|
|
define proglocals
|
|
set $i=bp->nlocs
|
|
while $i > 0
|
|
set $i=$i-1
|
|
gwrite fp[bp->nargs+$i]
|
|
end
|
|
end
|
|
|
|
define progstack
|
|
set $x=sp
|
|
while $x > stack_base
|
|
gwrite *$x
|
|
set $x=$x-1
|
|
end
|
|
end
|
|
|
|
define tc16
|
|
p ((scm_t_bits)$arg0) & 0xffff
|
|
end
|
|
|
|
define smobdescriptor
|
|
p scm_smobs[0xff & (((scm_t_bits)$arg0) >> 8)]
|
|
end
|
|
|
|
define vmstackinit
|
|
set $vmsp=sp
|
|
set $vmstack_base=stack_base
|
|
set $vmfp=fp
|
|
set $vmbp=bp
|
|
set $vmframe=0
|
|
end
|
|
|
|
define nextframe
|
|
set $orig_vmsp=$vmsp
|
|
while $vmsp > $vmstack_base
|
|
output $orig_vmsp - $vmsp
|
|
sputs "\t"
|
|
output $vmsp
|
|
sputs "\t"
|
|
gwrite *$vmsp
|
|
set $vmsp=$vmsp-1
|
|
end
|
|
newline
|
|
sputs "Frame "
|
|
output $vmframe
|
|
newline
|
|
sputs "ra:\t"
|
|
output $vmsp
|
|
sputs "\t"
|
|
output (SCM*)*$vmsp
|
|
set $vmsp=$vmsp-1
|
|
newline
|
|
sputs "mvra:\t"
|
|
output $vmsp
|
|
sputs "\t"
|
|
output (SCM*)*$vmsp
|
|
set $vmsp=$vmsp-1
|
|
newline
|
|
sputs "dl:\t"
|
|
output $vmsp
|
|
sputs "\t"
|
|
set $vmdl=(SCM*)(*$vmsp)
|
|
output $vmdl
|
|
newline
|
|
set $vmsp=$vmsp-1
|
|
sputs "el:\t"
|
|
output $vmsp
|
|
sputs "\t"
|
|
gwrite *$vmsp
|
|
set $vmsp=$vmsp-1
|
|
set $vmnlocs=(int)$vmbp->nlocs
|
|
while $vmnlocs > 0
|
|
sputs "loc #"
|
|
output $vmnlocs
|
|
sputs ":\t"
|
|
output $vmsp
|
|
sputs "\t"
|
|
gwrite *$vmsp
|
|
set $vmsp=$vmsp-1
|
|
set $vmnlocs=$vmnlocs-1
|
|
end
|
|
set $vmnargs=(int)$vmbp->nargs
|
|
while $vmnargs > 0
|
|
sputs "arg #"
|
|
output $vmnargs
|
|
sputs ":\t"
|
|
output $vmsp
|
|
sputs "\t"
|
|
gwrite *$vmsp
|
|
set $vmsp=$vmsp-1
|
|
set $vmnargs=$vmnargs-1
|
|
end
|
|
sputs "prog:\t"
|
|
output $vmsp
|
|
sputs "\t"
|
|
gwrite *$vmsp
|
|
set $vmsp=$vmsp-1
|
|
newline
|
|
if $vmdl
|
|
set $vmfp=$vmdl
|
|
set $vmbp=(struct scm_program*)(((SCM*)($vmfp[-1]))[1])
|
|
set $vmstack_base=$vmfp+$vmbp->nargs+$vmbp->nlocs+4
|
|
set $vmframe=$vmframe+1
|
|
newline
|
|
end
|
|
end
|
|
|
|
define vmstack
|
|
vmstackinit
|
|
while $vmsp > vp->stack_base
|
|
nextframe
|
|
end
|
|
end
|
|
|
|
define inst
|
|
p scm_instruction_table[$arg0]
|
|
end
|