Changeset 14641 for trunk/source/level-1


Ignore:
Timestamp:
Feb 4, 2011, 7:28:57 PM (8 years ago)
Author:
rme
Message:

More places that need to subtract tcr-bias.

File:
1 edited

Legend:

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

    r14619 r14641  
    293293
    294294(defun %current-xp ()
    295   (let ((xframe (%fixnum-ref (%current-tcr) target::tcr.xframe)))
     295  (let ((xframe (%fixnum-ref (%current-tcr) (- target::tcr.xframe
     296                                               target::tcr-bias))))
    296297    (when (eql xframe 0)
    297298      (error "No current exception frame"))
     
    662663  (if context
    663664    (bt.db-link context)
    664     (%fixnum-ref (%current-tcr)  target::tcr.db-link)))
     665    (%fixnum-ref (%current-tcr) (- target::tcr.db-link target::tcr-bias))))
    665666
    666667(defun previous-db-link (db-link start )
     
    11401141      ;; to BSP; if not, "append" them to the end of the current
    11411142      ;; linked list.
    1142       (let* ((current-db-link (%fixnum-ref (%current-tcr) target::tcr.db-link)))
     1143      (let* ((current-db-link (%fixnum-ref (%current-tcr)
     1144                                           (- target::tcr.db-link
     1145                                              target::tcr-bias))))
    11431146        (declare (fixnum current-db-link))
    11441147        (if (zerop current-db-link)
    1145           (setf (%fixnum-ref (%current-tcr) target::tcr.db-link) bsp)
     1148          (setf (%fixnum-ref (%current-tcr) (- target::tcr.db-link
     1149                                               target::tcr-bias)) bsp)
    11461150          (do* ((binding current-db-link)
    11471151                (next (%fixnum-ref binding 0)
     
    11541158      ;; on the callback) don't try to unwind the binding stack beyond
    11551159      ;; where it was just set.
    1156       (do* ((catch (%fixnum-ref (%current-tcr) target::tcr.catch-top)
     1160      (do* ((catch (%fixnum-ref (%current-tcr) (- target::tcr.catch-top
     1161                                                  target::tcr-bias))
    11571162                   (%fixnum-ref catch target::catch-frame.link)))
    11581163           ((zerop catch))
Note: See TracChangeset for help on using the changeset viewer.