0.pre7.129:

[sbcl.git] / src / code / kernel.lisp

diff --git a/src/code/kernel.lisp b/src/code/kernel.lisp
index 1654689..08b69bb 100644 (file)
--- a/src/code/kernel.lisp
+++ b/src/code/kernel.lisp
@@ -21,23 +21,23 @@
 (defun set-header-data (x val)
   (set-header-data x val))
 
-;;; Return the length of the closure X. This is one more than the
-;;; number of variables closed over.
+;;; the length of the closure X, i.e. one more than the
+;;; number of variables closed over
 (defun get-closure-length (x)
   (get-closure-length x))
 
-;;; Return the three-bit lowtag for the object X.
-(defun get-lowtag (x)
-  (get-lowtag x))
+(defun lowtag-of (x)
+  (lowtag-of x))
 
-;;; Return the 8-bit header type for the object X.
-(defun get-type (x)
-  (get-type x))
+(defun widetag-of (x)
+  (widetag-of x))
 
 ;;; Return a System-Area-Pointer pointing to the data for the vector
 ;;; X, which must be simple.
 ;;;
-;;; FIXME: so it should be SIMPLE-VECTOR-SAP, right?
+;;; FIXME: So it should be SIMPLE-VECTOR-SAP, right? (or UNHAIRY-VECTOR-SAP,
+;;; if the meaning is (SIMPLE-ARRAY * 1) instead of SIMPLE-VECTOR)
+;;; (or maybe SIMPLE-VECTOR-DATA-SAP or UNHAIRY-VECTOR-DATA-SAP?)
 (defun vector-sap (x)
   (declare (type (simple-unboxed-array (*)) x))
   (vector-sap x))
@@ -56,26 +56,32 @@
   (sb!c::control-stack-pointer-sap))
 
 ;;; Return the header typecode for FUNCTION. Can be set with SETF.
-(defun function-subtype (function)
-  (function-subtype function))
-(defun (setf function-subtype) (type function)
-  (setf (function-subtype function) type))
+(defun fun-subtype (function)
+  (fun-subtype function))
+(defun (setf fun-subtype) (type function)
+  (setf (fun-subtype function) type))
 
 ;;; Extract the arglist from the function header FUNC.
-(defun %function-arglist (func)
-  (%function-arglist func))
+(defun %simple-fun-arglist (func)
+  (%simple-fun-arglist func))
 
 ;;; Extract the name from the function header FUNC.
-(defun %function-name (func)
-  (%function-name func))
+(defun %simple-fun-name (func)
+  (%simple-fun-name func))
 
 ;;; Extract the type from the function header FUNC.
-(defun %function-type (func)
-  (%function-type func))
+(defun %simple-fun-type (func)
+  (%simple-fun-type func))
+
+(defun %simple-fun-next (simple-fun)
+  (%simple-fun-next simple-fun))
+
+(defun %simple-fun-self (simple-fun)
+  (%simple-fun-self simple-fun))
 
 ;;; Extract the function from CLOSURE.
-(defun %closure-function (closure)
-  (%closure-function closure))
+(defun %closure-fun (closure)
+  (%closure-fun closure))
 
 ;;; Return the length of VECTOR. There is no reason to use this in
 ;;; ordinary code, 'cause length (the vector foo)) is the same.
@@ -113,7 +119,8 @@
   (sb!kernel:%raw-bits object offset))
 
 (defun %set-raw-bits (object offset value)
-  (declare (type index offset) (type (unsigned-byte #.sb!vm:word-bits) value))
+  (declare (type index offset))
+  (declare (type (unsigned-byte #.sb!vm:n-word-bits) value))
   (setf (sb!kernel:%raw-bits object offset) value))
 
 (defun make-single-float (x) (make-single-float x))