Changeset 15115 for trunk/source


Ignore:
Timestamp:
Dec 6, 2011, 9:46:12 PM (8 years ago)
Author:
gz
Message:

Move the make-xxx-stack-range functions out of the inspector package

Location:
trunk/source
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/level-1/l1-readloop-lds.lisp

    r15109 r15115  
    641641  (not (null (find 'continue (cdr (bt.restarts context)) :key #'restart-name))))
    642642
     643;;; Each of these stack ranges defines the entire range of (control/value/temp)
     644;;; addresses; they can be used to addresses of stack-allocated objects
     645;;; for printing.
     646#-arm-target
     647(defun make-tsp-stack-range (tcr bt-info)
     648  (list (cons (%catch-tsp (bt.top-catch bt-info))
     649              (%fixnum-ref (%fixnum-ref tcr target::tcr.ts-area)
     650                                target::area.high))))
     651
     652#+ppc-target
     653(defun make-vsp-stack-range (tcr bt-info)
     654  (list (cons (%fixnum-ref
     655               (%svref (bt.top-catch bt-info) target::catch-frame.csp-cell)
     656               target::lisp-frame.savevsp)
     657              (%fixnum-ref (%fixnum-ref tcr target::tcr.vs-area) target::area.high))))
     658#+x8632-target
     659(defun make-vsp-stack-range (tcr bt-info)
     660  (list (cons (%svref (bt.top-catch bt-info) target::catch-frame.esp-cell)
     661              (%fixnum-ref
     662               (%fixnum-ref tcr (- target::tcr.vs-area target::tcr-bias))
     663               target::area.high))))
     664
     665#+x8664-target
     666(defun make-vsp-stack-range (tcr bt-info)
     667  (list (cons (%svref (bt.top-catch bt-info) target::catch-frame.rsp-cell)
     668              (%fixnum-ref (%fixnum-ref tcr target::tcr.vs-area) target::area.high))))
     669
     670#+arm-target
     671(defun make-vsp-stack-range (tcr bt-info)
     672  (list (cons (%fixnum-ref (catch-frame-sp (bt.top-catch bt-info)) target::lisp-frame.savevsp)
     673              (%fixnum-ref (%fixnum-ref tcr target::tcr.vs-area) target::area.high))))
     674
     675#+ppc-target
     676(defun make-csp-stack-range (tcr bt-info)
     677  (list (cons (%svref (bt.top-catch bt-info) target::catch-frame.csp-cell)
     678              (%fixnum-ref (%fixnum-ref tcr target::tcr.cs-area) target::area.high))))
     679
     680#+x8632-target
     681(defun make-csp-stack-range (tcr bt-info)
     682  (let ((cs-area nil))
     683    #+windows-target
     684    (let ((aux (%fixnum-ref tcr (- target::tcr.aux target::tcr-bias))))
     685      (setq cs-area (%fixnum-ref aux target::tcr-aux.cs-area)))
     686    #-windows-target
     687    (setq cs-area (%fixnum-ref tcr target::tcr.cs-area))
     688  (list (cons (%svref (bt.top-catch bt-info) target::catch-frame.foreign-sp-cell)
     689              (%fixnum-ref cs-area target::area.high)))))
     690
     691#+x8664-target
     692(defun make-csp-stack-range (tcr bt-info)
     693  (list (cons (%svref (bt.top-catch bt-info) target::catch-frame.foreign-sp-cell)
     694              (%fixnum-ref (%fixnum-ref tcr target::tcr.cs-area) target::area.high))))
     695
     696#+arm-target
     697(defun make-csp-stack-range (tcr bt-info)
     698  (list (cons (catch-frame-sp (bt.top-catch bt-info))
     699              (%fixnum-ref (%fixnum-ref tcr target::tcr.cs-area) target::area.high))))
     700
     701
     702
    643703(declaim (notinline select-backtrace))
    644704
  • trunk/source/lib/describe.lisp

    r14619 r15115  
    16521652             :break-condition (ccl::bt.break-condition context))
    16531653           #-arm-target
    1654            :tsp-range #-arm-target (make-tsp-stack-range tcr context)
    1655            :vsp-range (make-vsp-stack-range tcr context)
    1656            :csp-range (make-csp-stack-range tcr context)
     1654           :tsp-range #-arm-target (ccl::make-tsp-stack-range tcr context)
     1655           :vsp-range (ccl::make-vsp-stack-range tcr context)
     1656           :csp-range (ccl::make-csp-stack-range tcr context)
    16571657           initargs)))
    16581658
     
    17531753    (setf (inspector-line-count i) nil)
    17541754    frame-number))
    1755 
    1756 
    1757 ;;; Each of these stack ranges defines the entire range of (control/value/temp)
    1758 ;;; addresses; they can be used to addresses of stack-allocated objects
    1759 ;;; for printing.
    1760 #-arm-target
    1761 (defun make-tsp-stack-range (tcr bt-info)
    1762   (list (cons (ccl::%catch-tsp (ccl::bt.top-catch bt-info))
    1763               (ccl::%fixnum-ref (ccl::%fixnum-ref tcr target::tcr.ts-area)
    1764                                 target::area.high))))
    1765 
    1766 #+ppc-target
    1767 (defun make-vsp-stack-range (tcr bt-info)
    1768   (list (cons (ccl::%fixnum-ref
    1769                (ccl::%svref (ccl::bt.top-catch bt-info) target::catch-frame.csp-cell)
    1770                target::lisp-frame.savevsp)
    1771               (ccl::%fixnum-ref (ccl::%fixnum-ref tcr target::tcr.vs-area)
    1772                                 target::area.high))))
    1773 #+x8632-target
    1774 (defun make-vsp-stack-range (tcr bt-info)
    1775   (list (cons (ccl::%svref (ccl::bt.top-catch bt-info) target::catch-frame.esp-cell)
    1776               (ccl::%fixnum-ref (ccl::%fixnum-ref tcr (- target::tcr.vs-area
    1777                                                          target::tcr-bias))
    1778                                 target::area.high))))
    1779 
    1780 #+x8664-target
    1781 (defun make-vsp-stack-range (tcr bt-info)
    1782   (list (cons (ccl::%svref (ccl::bt.top-catch bt-info) target::catch-frame.rsp-cell)
    1783               (ccl::%fixnum-ref (ccl::%fixnum-ref tcr target::tcr.vs-area)
    1784                                 target::area.high))))
    1785 
    1786 #+arm-target
    1787 (defun make-vsp-stack-range (tcr bt-info)
    1788   (list (cons (ccl::%fixnum-ref (ccl::catch-frame-sp (ccl::bt.top-catch bt-info))
    1789                                 target::lisp-frame.savevsp)
    1790               (ccl::%fixnum-ref (ccl::%fixnum-ref tcr target::tcr.vs-area)
    1791                                 target::area.high))))
    1792 
    1793 #+ppc-target
    1794 (defun make-csp-stack-range (tcr bt-info)
    1795   (list (cons (ccl::%svref (ccl::bt.top-catch bt-info) target::catch-frame.csp-cell)
    1796               (ccl::%fixnum-ref (ccl::%fixnum-ref tcr target::tcr.cs-area)
    1797                                 target::area.high))))
    1798 
    1799 #+x8632-target
    1800 (defun make-csp-stack-range (tcr bt-info)
    1801   (let ((cs-area nil))
    1802     #+windows-target
    1803     (let ((aux (ccl::%fixnum-ref tcr (- target::tcr.aux target::tcr-bias))))
    1804       (setq cs-area (ccl::%fixnum-ref aux target::tcr-aux.cs-area)))
    1805     #-windows-target
    1806     (setq cs-area (ccl::%fixnum-ref tcr target::tcr.cs-area))
    1807   (list (cons (ccl::%svref (ccl::bt.top-catch bt-info) target::catch-frame.foreign-sp-cell)
    1808               (ccl::%fixnum-ref cs-area target::area.high)))))
    1809 
    1810 #+x8664-target
    1811 (defun make-csp-stack-range (tcr bt-info)
    1812   (list (cons (ccl::%svref (ccl::bt.top-catch bt-info) target::catch-frame.foreign-sp-cell)
    1813               (ccl::%fixnum-ref (ccl::%fixnum-ref tcr target::tcr.cs-area)
    1814                                 target::area.high))))
    1815 
    1816 #+arm-target
    1817 (defun make-csp-stack-range (tcr bt-info)
    1818   (list (cons (ccl::catch-frame-sp (ccl::bt.top-catch bt-info))
    1819               (ccl::%fixnum-ref (ccl::%fixnum-ref tcr target::tcr.cs-area)
    1820                                 target::area.high))))
    1821 
    18221755
    18231756;;; Inspector
Note: See TracChangeset for help on using the changeset viewer.