From fdbb0e59061b87ea2d032274ce0a6b8ad5c98862 Mon Sep 17 00:00:00 2001 From: Douglas Katzman Date: Wed, 31 Aug 2016 08:46:55 -0400 Subject: [PATCH] Remove a few unnecessary package qualifiers. --- src/code/room.lisp | 9 ++++----- tests/compiler-test-util.lisp | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/code/room.lisp b/src/code/room.lisp index f0d7e6290..86bc896f9 100644 --- a/src/code/room.lisp +++ b/src/code/room.lisp @@ -137,7 +137,7 @@ #!-sb-fluid (declaim (inline current-dynamic-space-start)) #!+gencgc -(defun current-dynamic-space-start () sb!vm:dynamic-space-start) +(defun current-dynamic-space-start () dynamic-space-start) #!-gencgc (defun current-dynamic-space-start () (extern-alien "current_dynamic_space" unsigned-long)) @@ -306,8 +306,7 @@ ;; will be a short. On platforms with larger ones, it'll ;; be an int. (bytes-used (unsigned - #.(if (typep sb!vm:gencgc-card-bytes - '(unsigned-byte 16)) + #.(if (typep gencgc-card-bytes '(unsigned-byte 16)) 16 32))) (flags (unsigned 8)) @@ -401,8 +400,8 @@ ;;; allocated in Space. (defun type-breakdown (space) (declare (muffle-conditions t)) - (let ((sizes (make-array 256 :initial-element 0 :element-type '(unsigned-byte #.sb!vm:n-word-bits))) - (counts (make-array 256 :initial-element 0 :element-type '(unsigned-byte #.sb!vm:n-word-bits)))) + (let ((sizes (make-array 256 :initial-element 0 :element-type '(unsigned-byte #.n-word-bits))) + (counts (make-array 256 :initial-element 0 :element-type '(unsigned-byte #.n-word-bits)))) (map-allocated-objects (lambda (obj type size) (declare (word size) (optimize (speed 3)) (ignore obj)) diff --git a/tests/compiler-test-util.lisp b/tests/compiler-test-util.lisp index 49efe4aa6..09d8e14a4 100644 --- a/tests/compiler-test-util.lisp +++ b/tests/compiler-test-util.lisp @@ -43,7 +43,7 @@ collect (sb-vm::value-cell-ref c)))) (defun find-named-callees (fun &key (type t) (name nil namep)) - (let ((code (sb-kernel:fun-code-header (sb-kernel:%fun-fun fun)))) + (let ((code (fun-code-header (%fun-fun fun)))) (loop for i from sb-vm:code-constants-offset below (code-header-words code) for c = (code-header-ref code i) when (and (typep c 'sb-impl::fdefn) @@ -54,14 +54,14 @@ collect (sb-impl::fdefn-fun c)))) (defun find-anonymous-callees (fun &key (type 'function)) - (let ((code (sb-kernel:fun-code-header (%fun-fun fun)))) + (let ((code (fun-code-header (%fun-fun fun)))) (loop for i from sb-vm:code-constants-offset below (code-header-words code) for fun = (code-header-ref code i) when (typep fun type) collect fun))) (defun find-code-constants (fun &key (type t)) - (let ((code (sb-kernel:fun-code-header (%fun-fun fun)))) + (let ((code (fun-code-header (%fun-fun fun)))) (loop for i from sb-vm:code-constants-offset below (code-header-words code) for c = (code-header-ref code i) when (typep c type) -- 2.11.4.GIT