projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move checking for constant ALIEN-INFO into a separate function
[sbcl.git]
/
src
/
code
/
room.lisp
diff --git
a/src/code/room.lisp
b/src/code/room.lisp
index
4e12042
..
3877c29
100644
(file)
--- a/
src/code/room.lisp
+++ b/
src/code/room.lisp
@@
-217,7
+217,7
@@
;; will be a short. On platforms with larger ones, it'll
;; be an int.
(bytes-used (unsigned
;; will be a short. On platforms with larger ones, it'll
;; be an int.
(bytes-used (unsigned
- #.(if (typep sb!vm:gencgc-page-bytes
+ #.(if (typep sb!vm:gencgc-card-bytes
'(unsigned-byte 16))
16
32)))
'(unsigned-byte 16))
16
32)))
@@
-265,7
+265,7
@@
(maybe-skip-page ()
#!+gencgc
(when (eq space :dynamic)
(maybe-skip-page ()
#!+gencgc
(when (eq space :dynamic)
- (loop with page-mask = #.(1- sb!vm:gencgc-page-bytes)
+ (loop with page-mask = #.(1- sb!vm:gencgc-card-bytes)
for addr of-type sb!vm:word = (sap-int current)
while (>= addr skip-tests-until-addr)
do
for addr of-type sb!vm:word = (sap-int current)
while (>= addr skip-tests-until-addr)
do
@@
-286,8
+286,8
@@
;; pointer is still below the allocation offset
;; of the page
(when (and (not (zerop alloc-flag))
;; pointer is still below the allocation offset
;; of the page
(when (and (not (zerop alloc-flag))
- (<= (logand page-mask addr)
- bytes-used))
+ (< (logand page-mask addr)
+ bytes-used))
;; Don't bother testing again until we
;; get past that allocation offset
(setf skip-tests-until-addr
;; Don't bother testing again until we
;; get past that allocation offset
(setf skip-tests-until-addr
@@
-297,7
+297,7
@@
(return-from maybe-skip-page))
;; Move CURRENT to start of next page.
(setf current (int-sap (+ (logandc2 addr page-mask)
(return-from maybe-skip-page))
;; Move CURRENT to start of next page.
(setf current (int-sap (+ (logandc2 addr page-mask)
- sb!vm:gencgc-page-bytes)))
+ sb!vm:gencgc-card-bytes)))
(maybe-finish-mapping))))))
(maybe-map (obj obj-tag n-obj-bytes &optional (ok t))
(let ((next (typecase n-obj-bytes
(maybe-finish-mapping))))))
(maybe-map (obj obj-tag n-obj-bytes &optional (ok t))
(let ((next (typecase n-obj-bytes
@@
-802,7
+802,7
@@
(push obj seen))))
(setf sp
#!+stack-grows-downward-not-upward (sap+ sp n-word-bytes)
(push obj seen))))
(setf sp
#!+stack-grows-downward-not-upward (sap+ sp n-word-bytes)
- #!-stack-grows-downward-not-upward (sap- sp n-word-bytes)))))
+ #!-stack-grows-downward-not-upward (sap+ sp (- n-word-bytes))))))
(defun map-referencing-objects (fun space object)
(declare (type spaces space) (inline map-allocated-objects))
(defun map-referencing-objects (fun space object)
(declare (type spaces space) (inline map-allocated-objects))