[Openmcl-cvs-notifications] r15115 - in /trunk/source: level-1/l1-readloop-lds.lisp lib/describe.lisp
gz at clozure.com
gz at clozure.com
Tue Dec 6 15:46:12 CST 2011
Author: gz
Date: Tue Dec 6 15:46:12 2011
New Revision: 15115
Log:
Move the make-xxx-stack-range functions out of the inspector package
Modified:
trunk/source/level-1/l1-readloop-lds.lisp
trunk/source/lib/describe.lisp
Modified: trunk/source/level-1/l1-readloop-lds.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/level-1/l1-readloop-lds.lisp (original)
+++ trunk/source/level-1/l1-readloop-lds.lisp Tue Dec 6 15:46:12 2011
@@ -640,6 +640,66 @@
(defmethod backtrace-context-continuable-p ((context vector))
(not (null (find 'continue (cdr (bt.restarts context)) :key #'restart-na=
me))))
=
+;;; Each of these stack ranges defines the entire range of (control/value/=
temp)
+;;; addresses; they can be used to addresses of stack-allocated objects
+;;; for printing.
+#-arm-target
+(defun make-tsp-stack-range (tcr bt-info)
+ (list (cons (%catch-tsp (bt.top-catch bt-info))
+ (%fixnum-ref (%fixnum-ref tcr target::tcr.ts-area)
+ target::area.high))))
+
+#+ppc-target
+(defun make-vsp-stack-range (tcr bt-info)
+ (list (cons (%fixnum-ref
+ (%svref (bt.top-catch bt-info) target::catch-frame.csp-cell)
+ target::lisp-frame.savevsp)
+ (%fixnum-ref (%fixnum-ref tcr target::tcr.vs-area) target::a=
rea.high))))
+#+x8632-target
+(defun make-vsp-stack-range (tcr bt-info)
+ (list (cons (%svref (bt.top-catch bt-info) target::catch-frame.esp-cell)
+ (%fixnum-ref
+ (%fixnum-ref tcr (- target::tcr.vs-area target::tcr-bias))
+ target::area.high))))
+
+#+x8664-target
+(defun make-vsp-stack-range (tcr bt-info)
+ (list (cons (%svref (bt.top-catch bt-info) target::catch-frame.rsp-cell)
+ (%fixnum-ref (%fixnum-ref tcr target::tcr.vs-area) target::a=
rea.high))))
+
+#+arm-target =
+(defun make-vsp-stack-range (tcr bt-info)
+ (list (cons (%fixnum-ref (catch-frame-sp (bt.top-catch bt-info)) target:=
:lisp-frame.savevsp)
+ (%fixnum-ref (%fixnum-ref tcr target::tcr.vs-area) target::a=
rea.high))))
+
+#+ppc-target
+(defun make-csp-stack-range (tcr bt-info)
+ (list (cons (%svref (bt.top-catch bt-info) target::catch-frame.csp-cell)
+ (%fixnum-ref (%fixnum-ref tcr target::tcr.cs-area) target::a=
rea.high))))
+
+#+x8632-target
+(defun make-csp-stack-range (tcr bt-info)
+ (let ((cs-area nil))
+ #+windows-target
+ (let ((aux (%fixnum-ref tcr (- target::tcr.aux target::tcr-bias))))
+ (setq cs-area (%fixnum-ref aux target::tcr-aux.cs-area)))
+ #-windows-target
+ (setq cs-area (%fixnum-ref tcr target::tcr.cs-area))
+ (list (cons (%svref (bt.top-catch bt-info) target::catch-frame.foreign-s=
p-cell)
+ (%fixnum-ref cs-area target::area.high)))))
+
+#+x8664-target
+(defun make-csp-stack-range (tcr bt-info)
+ (list (cons (%svref (bt.top-catch bt-info) target::catch-frame.foreign-s=
p-cell)
+ (%fixnum-ref (%fixnum-ref tcr target::tcr.cs-area) target::a=
rea.high))))
+
+#+arm-target
+(defun make-csp-stack-range (tcr bt-info)
+ (list (cons (catch-frame-sp (bt.top-catch bt-info))
+ (%fixnum-ref (%fixnum-ref tcr target::tcr.cs-area) target::a=
rea.high))))
+
+
+
(declaim (notinline select-backtrace))
=
(defun select-backtrace ()
Modified: trunk/source/lib/describe.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lib/describe.lisp (original)
+++ trunk/source/lib/describe.lisp Tue Dec 6 15:46:12 2011
@@ -1649,9 +1649,9 @@
:context context
:break-condition (ccl::bt.break-condition context))
#-arm-target
- :tsp-range #-arm-target (make-tsp-stack-range tcr context)
- :vsp-range (make-vsp-stack-range tcr context)
- :csp-range (make-csp-stack-range tcr context)
+ :tsp-range #-arm-target (ccl::make-tsp-stack-range tcr context)
+ :vsp-range (ccl::make-vsp-stack-range tcr context)
+ :csp-range (ccl::make-csp-stack-range tcr context)
initargs)))
=
(defmethod print-object ((i stack-inspector) stream)
@@ -1751,72 +1751,6 @@
(setf (inspector-line-count i) nil)
frame-number))
=
-
-;;; Each of these stack ranges defines the entire range of (control/value/=
temp)
-;;; addresses; they can be used to addresses of stack-allocated objects
-;;; for printing.
-#-arm-target
-(defun make-tsp-stack-range (tcr bt-info)
- (list (cons (ccl::%catch-tsp (ccl::bt.top-catch bt-info))
- (ccl::%fixnum-ref (ccl::%fixnum-ref tcr target::tcr.ts-area)
- target::area.high))))
-
-#+ppc-target
-(defun make-vsp-stack-range (tcr bt-info)
- (list (cons (ccl::%fixnum-ref
- (ccl::%svref (ccl::bt.top-catch bt-info) target::catch-fram=
e.csp-cell)
- target::lisp-frame.savevsp)
- (ccl::%fixnum-ref (ccl::%fixnum-ref tcr target::tcr.vs-area)
- target::area.high))))
-#+x8632-target
-(defun make-vsp-stack-range (tcr bt-info)
- (list (cons (ccl::%svref (ccl::bt.top-catch bt-info) target::catch-frame=
.esp-cell)
- (ccl::%fixnum-ref (ccl::%fixnum-ref tcr (- target::tcr.vs-ar=
ea
- target::tcr-bias))
- target::area.high))))
-
-#+x8664-target
-(defun make-vsp-stack-range (tcr bt-info)
- (list (cons (ccl::%svref (ccl::bt.top-catch bt-info) target::catch-frame=
.rsp-cell)
- (ccl::%fixnum-ref (ccl::%fixnum-ref tcr target::tcr.vs-area)
- target::area.high))))
-
-#+arm-target =
-(defun make-vsp-stack-range (tcr bt-info)
- (list (cons (ccl::%fixnum-ref (ccl::catch-frame-sp (ccl::bt.top-catch bt=
-info))
- target::lisp-frame.savevsp)
- (ccl::%fixnum-ref (ccl::%fixnum-ref tcr target::tcr.vs-area)
- target::area.high))))
-
-#+ppc-target
-(defun make-csp-stack-range (tcr bt-info)
- (list (cons (ccl::%svref (ccl::bt.top-catch bt-info) target::catch-frame=
.csp-cell)
- (ccl::%fixnum-ref (ccl::%fixnum-ref tcr target::tcr.cs-area)
- target::area.high))))
-
-#+x8632-target
-(defun make-csp-stack-range (tcr bt-info)
- (let ((cs-area nil))
- #+windows-target
- (let ((aux (ccl::%fixnum-ref tcr (- target::tcr.aux target::tcr-bias))=
))
- (setq cs-area (ccl::%fixnum-ref aux target::tcr-aux.cs-area)))
- #-windows-target
- (setq cs-area (ccl::%fixnum-ref tcr target::tcr.cs-area))
- (list (cons (ccl::%svref (ccl::bt.top-catch bt-info) target::catch-frame=
.foreign-sp-cell)
- (ccl::%fixnum-ref cs-area target::area.high)))))
-
-#+x8664-target
-(defun make-csp-stack-range (tcr bt-info)
- (list (cons (ccl::%svref (ccl::bt.top-catch bt-info) target::catch-frame=
.foreign-sp-cell)
- (ccl::%fixnum-ref (ccl::%fixnum-ref tcr target::tcr.cs-area)
- target::area.high))))
-
-#+arm-target
-(defun make-csp-stack-range (tcr bt-info)
- (list (cons (ccl::catch-frame-sp (ccl::bt.top-catch bt-info))
- (ccl::%fixnum-ref (ccl::%fixnum-ref tcr target::tcr.cs-area)
- target::area.high))))
-=0C
;;; Inspector
=
=
More information about the Openmcl-cvs-notifications
mailing list