summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2014-05-04 11:46:18 +0200
committerAndy Wingo <wingo@pobox.com>2014-05-04 11:46:18 +0200
commit7c080187bc55e84159b99faa9b7ae9f0a8ae90d2 (patch)
treef9e9f3df501113e8e6504449ec63fb8a689a826f
parent18f8fd0211714f4d18ebab4dc4b85950c97483f4 (diff)
downloadguile-7c080187bc55e84159b99faa9b7ae9f0a8ae90d2.tar.gz
frame-address, frame-stack-pointer return offsets
* libguile/frames.c (scm_frame_address, scm_frame_stack_pointer): Return offsets instead of absolute pointers. This is robust in the presence of stack relocation. * module/system/repl/debug.scm (print-registers): Adapt to print sp and fp as integers.
-rw-r--r--libguile/frames.c4
-rw-r--r--module/system/repl/debug.scm4
2 files changed, 4 insertions, 4 deletions
diff --git a/libguile/frames.c b/libguile/frames.c
index cf9648d57..2162f49ce 100644
--- a/libguile/frames.c
+++ b/libguile/frames.c
@@ -277,7 +277,7 @@ SCM_DEFINE (scm_frame_address, "frame-address", 1, 0, 0,
#define FUNC_NAME s_scm_frame_address
{
SCM_VALIDATE_VM_FRAME (1, frame);
- return scm_from_uintptr_t ((scm_t_uintptr) SCM_VM_FRAME_FP (frame));
+ return scm_from_ptrdiff_t (SCM_VM_FRAME_FP_OFFSET (frame));
}
#undef FUNC_NAME
@@ -288,7 +288,7 @@ SCM_DEFINE (scm_frame_stack_pointer, "frame-stack-pointer", 1, 0, 0,
{
SCM_VALIDATE_VM_FRAME (1, frame);
- return scm_from_uintptr_t ((scm_t_uintptr) SCM_VM_FRAME_SP (frame));
+ return scm_from_ptrdiff_t (SCM_VM_FRAME_SP_OFFSET (frame));
}
#undef FUNC_NAME
diff --git a/module/system/repl/debug.scm b/module/system/repl/debug.scm
index a15defc25..300145d16 100644
--- a/module/system/repl/debug.scm
+++ b/module/system/repl/debug.scm
@@ -100,8 +100,8 @@
(format port " (#x~x~@d)" code
(- (frame-instruction-pointer frame) code))))
(newline port)
- (print "sp = #x~x\n" (frame-stack-pointer frame))
- (print "fp = #x~x\n" (frame-address frame)))
+ (print "sp = ~a\n" (frame-stack-pointer frame))
+ (print "fp = ~a\n" (frame-address frame)))
(define* (print-locals frame #:optional (port (current-output-port))
#:key (width (terminal-width)) (per-line-prefix " "))