Changeset 751

Timestamp:

Apr 2, 2004, 9:47:30 PM (21 years ago)

Author:

Gary Byers

Message:

Fencepost in %PTR-IN-AREA-P.
Deprecate (and remove some calls to) %ACTIVE-AREA, since stacks have
been contiguous for a couple of years now ...

File:

• trunk/ccl/level-1/l1-lisp-threads.lisp (modified) (3 diffs)

trunk/ccl/level-1/l1-lisp-threads.lisp

@@ -771 +771 @@
 
 (defun %ptr-in-area-p (ptr area)
-  (declare (fixnum ptr area))
+  (declare (fixnum ptr area))           ; lie, maybe
   (and (<= (the fixnum (%fixnum-ref area ppc32::area.low)) ptr)
-       (>= (the fixnum (%fixnum-ref area ppc32::area.high)) ptr)))
+       (> (the fixnum (%fixnum-ref area ppc32::area.high)) ptr)))
 
 (defun %active-area (area active)
@@ -786 +786 @@
 
 (defun %ptr-to-vstack-p (tcr idx)
-  (declare (fixnum idx))
-  (let* ((vs-area (%active-area (%fixnum-ref tcr ppc32::tcr.vs-area) idx)))
-    (when vs-area
-      (let ((active (if (and (eq tcr (%current-tcr))
-                             (%ptr-in-area-p (%current-vsp) vs-area))
-                      (%current-vsp)
-                      (%fixnum-ref vs-area ppc32::area.active)))
-            (high (%fixnum-ref vs-area ppc32::area.high)))
-        (declare (fixnum active high))
-        (and (< active idx)
-             (< idx high))))))
+  (%ptr-in-area-p idx (%fixnum-ref tcr ppc32::tcr.vs-area)))
 
 (defun %on-tsp-stack (tcr object)
-  (declare (fixnum object))             ; lie
-  (let* ((ts-area (%active-area (%fixnum-ref tcr ppc32::tcr.ts-area) object)))
-    (when ts-area
-      (let ((active (if (and (eq tcr (%current-tcr))
-                             (%ptr-in-area-p (%current-tsp) ts-area))
-                      (%current-tsp)
-                      (%fixnum-ref ts-area ppc32::area.active)))
-            (high (%fixnum-ref ts-area ppc32::area.high)))
-        (declare (fixnum active high))
-        (and (< active object)
-             (< object high))))))
+  (%ptr-in-area-p object (%fixnum-ref tcr ppc32::tcr.ts-area)))
 
 (defparameter *aux-tsp-ranges* ())
@@ -925 +905 @@
         (setq parent (parent-frame frame tcr)))
       (let ((parent-vsp (if parent (%frame-savevsp parent) vsp))
-            (vsp-area (%active-area (%fixnum-ref tcr ppc32::tcr.vs-area) vsp)))
+            (vsp-area (%fixnum-ref tcr ppc32::tcr.vs-area)))
         (if (eql 0 parent-vsp)
           (values vsp vsp)              ; p is the kernel frame pushed by an unwind-protect cleanup form