projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.26.5: improve CONDITION-WAIT, RELEASE-MUTEX
[sbcl.git]
/
src
/
code
/
debug-int.lisp
diff --git
a/src/code/debug-int.lisp
b/src/code/debug-int.lisp
index
61cf456
..
57fe61d
100644
(file)
--- a/
src/code/debug-int.lisp
+++ b/
src/code/debug-int.lisp
@@
-662,8
+662,9
@@
;;; this function.
(defun top-frame ()
(/noshow0 "entering TOP-FRAME")
;;; this function.
(defun top-frame ()
(/noshow0 "entering TOP-FRAME")
- (multiple-value-bind (fp pc) (%caller-frame-and-pc)
- (compute-calling-frame (descriptor-sap fp) pc nil)))
+ (compute-calling-frame (descriptor-sap (%caller-frame))
+ (%caller-pc)
+ nil))
;;; Flush all of the frames above FRAME, and renumber all the frames
;;; below FRAME.
;;; Flush all of the frames above FRAME, and renumber all the frames
;;; below FRAME.
@@
-677,7
+678,9
@@
(defun find-saved-frame-down (fp up-frame)
(multiple-value-bind (saved-fp saved-pc) (sb!c:find-saved-fp-and-pc fp)
(when saved-fp
(defun find-saved-frame-down (fp up-frame)
(multiple-value-bind (saved-fp saved-pc) (sb!c:find-saved-fp-and-pc fp)
(when saved-fp
- (compute-calling-frame (descriptor-sap saved-fp) saved-pc up-frame))))
+ (compute-calling-frame (descriptor-sap saved-fp)
+ (descriptor-sap saved-pc)
+ up-frame))))
;;; Return the frame immediately below FRAME on the stack; or when
;;; FRAME is the bottom of the stack, return NIL.
;;; Return the frame immediately below FRAME on the stack; or when
;;; FRAME is the bottom of the stack, return NIL.
@@
-878,7
+881,9
@@
(declare (type (unsigned-byte 32) n)
(optimize (speed 3) (safety 0)))
(sb!alien:sap-alien (sb!vm::current-thread-offset-sap
(declare (type (unsigned-byte 32) n)
(optimize (speed 3) (safety 0)))
(sb!alien:sap-alien (sb!vm::current-thread-offset-sap
- (+ sb!vm::thread-interrupt-contexts-offset n))
+ (+ sb!vm::thread-interrupt-contexts-offset
+ #!-alpha n
+ #!+alpha (* 2 n)))
(* os-context-t)))
#!+(or x86 x86-64)
(* os-context-t)))
#!+(or x86 x86-64)