diff options
author | Andy Wingo <wingo@pobox.com> | 2013-11-07 23:03:45 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-11-07 23:03:45 +0100 |
commit | 581a4eb82b1534970060e3cbd79b9a96d351edf9 (patch) | |
tree | ffd7c1b175ca1746f63f697b4259e52c6c66597a /libguile/frames.c | |
parent | 72b82b0f210ef47798133dabf2a81eef3e036ba6 (diff) | |
download | guile-581a4eb82b1534970060e3cbd79b9a96d351edf9.tar.gz |
frame-instruction-pointer is absolute; rewrite (system vm coverage)
* libguile/frames.c (scm_frame_source): Instead of assuming that
scm_frame_procedure is correct, use the IP to get the source.
(scm_frame_instruction_pointer): Return an absolute value instead of
assuming that slot 0 is correct. (It isn't, when preparing for a tail
call.)
* libguile/programs.h:
* libguile/programs.c (scm_find_source_for_addr): New internal helper.
* module/system/repl/debug.scm (print-registers): Readably print
absolute instruction pointers.
* module/system/vm/coverage.scm: Complete rewrite to use absolute IP's.
We can't assume that frame-procedure is cheap if it is correct, or
correct if it is cheap. Anyway using the address is better anyway.
(coverage-data->lcov): Disable per-function info temporarily.
(loaded-modules, module-procedures, closest-source-line)
(closed-over-procedures): Remove these. Instead of going from
procedures to source info, now we go from ELF image to source info.
* module/system/vm/debug.scm (debug-context-length): New interface.
* module/system/vm/program.scm (source-for-addr): New internal helper.
Diffstat (limited to 'libguile/frames.c')
-rw-r--r-- | libguile/frames.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/libguile/frames.c b/libguile/frames.c index 847081890..d32f8374c 100644 --- a/libguile/frames.c +++ b/libguile/frames.c @@ -104,18 +104,9 @@ SCM_DEFINE (scm_frame_source, "frame-source", 1, 0, 0, "") #define FUNC_NAME s_scm_frame_source { - SCM proc; - SCM_VALIDATE_VM_FRAME (1, frame); - proc = scm_frame_procedure (frame); - - if (SCM_PROGRAM_P (proc) || SCM_RTL_PROGRAM_P (proc)) - return scm_program_source (scm_frame_procedure (frame), - scm_frame_instruction_pointer (frame), - SCM_UNDEFINED); - - return SCM_BOOL_F; + return scm_find_source_for_addr (scm_frame_instruction_pointer (frame)); } #undef FUNC_NAME @@ -254,22 +245,9 @@ SCM_DEFINE (scm_frame_instruction_pointer, "frame-instruction-pointer", 1, 0, 0, "") #define FUNC_NAME s_scm_frame_instruction_pointer { - SCM program; - const struct scm_objcode *c_objcode; - SCM_VALIDATE_VM_FRAME (1, frame); - program = scm_frame_procedure (frame); - - if (SCM_RTL_PROGRAM_P (program)) - return scm_from_ptrdiff_t (SCM_VM_FRAME_IP (frame) - - (scm_t_uint8 *) SCM_RTL_PROGRAM_CODE (program)); - - if (!SCM_PROGRAM_P (program)) - return SCM_INUM0; - c_objcode = SCM_PROGRAM_DATA (program); - return scm_from_unsigned_integer ((SCM_VM_FRAME_IP (frame) - - SCM_C_OBJCODE_BASE (c_objcode))); + return scm_from_uintptr_t ((scm_t_uintptr) SCM_VM_FRAME_IP (frame)); } #undef FUNC_NAME |