0.pre7.61:
[sbcl.git] / package-data-list.lisp-expr
index 3c73fa6..042c224 100644 (file)
@@ -1,9 +1,16 @@
-;;;; the specifications of SBCL-specific packages, except..
+;;;; -*- Lisp -*-
+
+;;;; the specifications of target packages, except for a few things
+;;;; which are handled elsewhere by other mechanisms:
 ;;;;   * the creation of the trivial SB-SLOT-ACCESSOR-NAME package
 ;;;;   * any SHADOWing hackery
-;;;; The standard, non-SBCL-specific packages COMMON-LISP,
-;;;; COMMON-LISP-USER, and KEYWORD are also handled through other
-;;;; mechanisms.
+;;;;   * the standard, non-SBCL-specific packages COMMON-LISP,
+;;;;     COMMON-LISP-USER, and KEYWORD
+;;;;
+;;;; The packages are named SB!FOO here and elsewhere in
+;;;; cross-compilation, in order to avoid collision with corresponding
+;;;; SB-FOO packages in the cross-compilation host. They're renamed to
+;;;; SB-FOO later, after the danger of collision has passed.
 
 ;;;; This software is part of the SBCL system. See the README file for
 ;;;; more information.
     :reexport ("ARRAY" "BOOLEAN" "DOUBLE-FLOAT" "LONG-FLOAT" "FUNCTION"
                "INTEGER" "SINGLE-FLOAT" "UNION"  "SYSTEM-AREA-POINTER"
                "VALUES" "*")
-    :export ("ADDR" "ALIEN" "ALIEN-FUNCALL" "ALIEN-SAP"
-             "ALIEN-SIZE" "ALIEN-BOOLEAN" "CAST" "DEF-ALIEN-ROUTINE"
-             "DEF-ALIEN-TYPE" "DEF-ALIEN-VARIABLE" "DEF-BUILTIN-ALIEN-TYPE"
-             "DEREF" "ENUM" "EXTERN-ALIEN"
+    :export ("ADDR" "ALIEN" "ALIEN-FUNCALL" "ALIEN-SAP" "ALIEN-SIZE" 
+            "CAST"
+            "DEF-ALIEN-ROUTINE" "DEF-ALIEN-TYPE"
+            "DEF-ALIEN-VARIABLE" "DEF-BUILTIN-ALIEN-TYPE"
+             "DEREF"
+            "ENUM" "EXTERN-ALIEN"
+            "FREE-ALIEN" 
+             "LOAD-FOREIGN" "LOAD-1-FOREIGN"
+            "MAKE-ALIEN"
+            "NULL-ALIEN"
              "SAP-ALIEN" "SIGNED" "SLOT" "STRUCT"
-             "UNSIGNED" "WITH-ALIEN" "FREE-ALIEN" "NULL-ALIEN"
-             "MAKE-ALIEN"
-             "LOAD-FOREIGN" "LOAD-1-FOREIGN"))
+             "UNSIGNED"
+            "WITH-ALIEN"))
 
  #s(sb-cold:package-data
     :name "SB!ALIEN-INTERNALS"
@@ -42,9 +54,9 @@
              "ALIEN-ARRAY-TYPE-P" "ALIEN-BOOLEAN-TYPE" "ALIEN-BOOLEAN-TYPE-P"
              "ALIEN-DOUBLE-FLOAT-TYPE" "ALIEN-DOUBLE-FLOAT-TYPE-P"
              "ALIEN-ENUM-TYPE" "ALIEN-ENUM-TYPE-P" "ALIEN-FLOAT-TYPE"
-             "ALIEN-FLOAT-TYPE-P" "ALIEN-FUNCTION-TYPE"
-             "ALIEN-FUNCTION-TYPE-ARG-TYPES" "ALIEN-FUNCTION-TYPE-P"
-             "ALIEN-FUNCTION-TYPE-RESULT-TYPE" "ALIEN-INTEGER-TYPE"
+             "ALIEN-FLOAT-TYPE-P" "ALIEN-FUN-TYPE"
+             "ALIEN-FUN-TYPE-ARG-TYPES" "ALIEN-FUN-TYPE-P"
+             "ALIEN-FUN-TYPE-RESULT-TYPE" "ALIEN-INTEGER-TYPE"
              "ALIEN-INTEGER-TYPE-P" "ALIEN-INTEGER-TYPE-SIGNED"
              "ALIEN-LONG-FLOAT-TYPE" "ALIEN-LONG-FLOAT-TYPE-P"
              "ALIEN-POINTER-TYPE" "ALIEN-POINTER-TYPE-P"
@@ -69,7 +81,7 @@
              "HEAP-ALIEN-INFO-TYPE" "INVOKE-ALIEN-TYPE-METHOD" "LOCAL-ALIEN"
              "LOCAL-ALIEN-INFO" "LOCAL-ALIEN-INFO-FORCE-TO-MEMORY-P"
              "LOCAL-ALIEN-INFO-P" "LOCAL-ALIEN-INFO-TYPE"
-             "MAKE-ALIEN-FUNCTION-TYPE" "MAKE-ALIEN-POINTER-TYPE"
+             "MAKE-ALIEN-FUN-TYPE" "MAKE-ALIEN-POINTER-TYPE"
              "MAKE-ALIEN-VALUE"
              "MAKE-LOCAL-ALIEN" "NATURALIZE"
              "NOTE-LOCAL-ALIEN-TYPE"
     :doc "private: implementation of the compiler"
     ;; (It seems strange to have the compiler USE SB-ALIEN-INTERNALS,
     ;; but the point seems to be to be able to express things like
-    ;; SB-C:DEFTRANSFORM SB-ALIEN-INTERNALS:MAKE-LOCAL-ALIEN without
+    ;; SB!C:DEFTRANSFORM SB-ALIEN-INTERNALS:MAKE-LOCAL-ALIEN without
     ;; having to use a bunch of package prefixes, by putting them
     ;; in the SB-C package. Maybe it'd be tidier to define an SB-ALIEN-COMP
     ;; package for this? But it seems like a fairly low priority.)
           #!+sb-dyncount "SB-DYNCOUNT" "SB!EXT" "SB!FASL" "SB!INT"
           "SB!KERNEL" "SB!SYS")
     :reexport ("SLOT" "CODE-INSTRUCTIONS" "FLUSHABLE")
-    :export ("%ALIEN-FUNCALL" "%CATCH-BREAKUP" "%CONTINUE-UNWIND" "&MORE"
+    :export ("%ALIEN-FUNCALL" "%CATCH-BREAKUP" "%CONTINUE-UNWIND" 
               "%LISTIFY-REST-ARGS" "%MORE-ARG" "%MORE-ARG-VALUES"
               "%UNWIND-PROTECT-BREAKUP"
 
               "*BACKEND-BYTE-ORDER*" "*BACKEND-DISASSEM-PARAMS*"
-              "*BACKEND-INFO-ENVIRONMENT*"
               "*BACKEND-INSTRUCTION-FLAVORS*" "*BACKEND-INSTRUCTION-FORMATS*"
               "*BACKEND-INTERNAL-ERRORS*" "*BACKEND-PAGE-SIZE*"
               "*BACKEND-REGISTER-SAVE-PENALTY*"
               "*BACKEND-SB-LIST*" "*BACKEND-SB-NAMES*"
               "*BACKEND-SC-NAMES*" "*BACKEND-SC-NUMBERS*"
               "*BACKEND-SPECIAL-ARG-TYPES*"
+              "*BACKEND-SUBFEATURES*"
               "*BACKEND-T-PRIMITIVE-TYPE*"
 
               "*CODE-SEGMENT*" 
-              "*CONVERTING-FOR-INTERPRETER*"
-              "*COUNT-VOP-USAGES*" "*ELSEWHERE*"
+              "*COUNT-VOP-USAGES*" "*ELSEWHERE*" "*FREE-FUNCTIONS*"
               "*SETF-ASSUMED-FBOUNDP*"
               "*SUPPRESS-VALUES-DECLARATION*"
 
               "CALL" "CALL-LOCAL" "CALL-NAMED" "CALL-OUT" "CALL-VARIABLE"
               "CALLEE-NFP-TN" "CALLEE-RETURN-PC-TN"
               "CASE-BODY" "CATCH-BLOCK" "CHECK-CONS"
-              "CHECK-FIXNUM" "CHECK-FUNCTION" "CHECK-FUNCTION-OR-SYMBOL"
+              "CHECK-FIXNUM" "CHECK-FUNCTION"
               "CHECK-SIGNED-BYTE-32" "CHECK-SYMBOL" "CHECK-UNSIGNED-BYTE-32"
               "CLOSURE-INIT" "CLOSURE-REF"
               "CODE-CONSTANT-REF" "CODE-CONSTANT-SET" 
-              "COMPILE-FOR-EVAL" "COMPILER-ERROR"
+             "COMPILE-LAMBDA-FOR-DEFUN"
+              "%COMPILER-DEFUN" "COMPILER-ERROR"
               "COMPONENT" "COMPONENT-HEADER-LENGTH"
               "COMPONENT-INFO" "COMPONENT-LIVE-TN" "COMPUTE-FUNCTION"
               "COMPUTE-OLD-NFP" "COPY-MORE-ARG" 
               "DEFKNOWN" "DEFOPTIMIZER"
               "DEFTRANSFORM" "DERIVE-TYPE"
               "ENTRY-NODE-INFO-NLX-TAG" "ENTRY-NODE-INFO-ST-TOP"
-              "ENVIRONMENT-DEBUG-LIVE-TN" "ENVIRONMENT-LIVE-TN"
+              "PHYSENV-DEBUG-LIVE-TN" "PHYSENV-LIVE-TN"
               "FAST-SYMBOL-FUNCTION" "FAST-SYMBOL-VALUE" "FOLDABLE"
-              "FORCE-TN-TO-STACK" "GET-VECTOR-SUBTYPE"
-              "HALT" "IF-EQ" "INSTANCE-REF" "INSTANCE-SET"
+              "FORCE-TN-TO-STACK"
+             "GET-VECTOR-SUBTYPE"
+              "HALT"
+             "IF-EQ" "INLINE-SYNTACTIC-CLOSURE-LAMBDA"
+             "INSTANCE-REF" "INSTANCE-SET"
               "IR2-COMPONENT-CONSTANTS" "IR2-CONVERT"
-              "IR2-ENVIRONMENT-NUMBER-STACK-P" "KNOWN-CALL-LOCAL"
-              "KNOWN-RETURN" "LAMBDA-EVAL-INFO-ARGS-PASSED"
-              "LAMBDA-EVAL-INFO-ENTRIES" "LAMBDA-EVAL-INFO-FRAME-SIZE"
-              "LAMBDA-EVAL-INFO-FUNCTION" "LOCATION=" "LTN-ANNOTATE"
+              "IR2-PHYSENV-NUMBER-STACK-P"
+             "KNOWN-CALL-LOCAL" "KNOWN-RETURN"
+             "LAMBDA-INDEPENDENT-OF-LEXENV-P"
+             "LAMBDA-WITH-LEXENV" "LOCATION=" "LTN-ANNOTATE"
               "MAKE-ALIAS-TN" "MAKE-CATCH-BLOCK"
               "MAKE-CLOSURE" "MAKE-CONSTANT-TN" "MAKE-FIXNUM"
               "MAKE-LOAD-TIME-CONSTANT-TN" "MAKE-N-TNS" "MAKE-NORMAL-TN"
               "MAKE-OTHER-IMMEDIATE-TYPE" "MAKE-RANDOM-TN"
               "MAKE-REPRESENTATION-TN" "MAKE-RESTRICTED-TN" "MAKE-SC-OFFSET"
               "MAKE-STACK-POINTER-TN" "MAKE-TN-REF" "MAKE-UNWIND-BLOCK"
-              "MAKE-VALUE-CELL" "MAKE-WIRED-TN" "MAYBE-COMPILER-NOTE"
+             "MAKE-WIRED-TN" "MAYBE-COMPILER-NOTE"
               "META-PRIMITIVE-TYPE-OR-LOSE"
               "META-SB-OR-LOSE" "META-SC-NUMBER-OR-LOSE" "META-SC-OR-LOSE"
               "MORE-ARG-CONTEXT" "MOVABLE" "MOVE" "MULTIPLE-CALL"
               "MULTIPLE-CALL-LOCAL" "MULTIPLE-CALL-NAMED"
-              "MULTIPLE-CALL-VARIABLE" "NLX-ENTRY" "NLX-ENTRY-MULTIPLE"
+             "MULTIPLE-CALL-VARIABLE"
+             "NLX-ENTRY" "NLX-ENTRY-MULTIPLE"
               "NON-DESCRIPTOR-STACK" "NOTE-ENVIRONMENT-START"
               "NOTE-THIS-LOCATION" "OPTIMIZER" "PACK-TRACE-TABLE"
+              "PARSE-EVAL-WHEN-SITUATIONS"
               "POLICY" "PREDICATE" "PRIMITIVE-TYPE" "PRIMITIVE-TYPE-OF"
               "PRIMITIVE-TYPE-OR-LOSE" "PRIMITIVE-TYPE-VOP"
               "PRIMITIVE-TYPE-NAME" "PUSH-VALUES"
               "TN-REF-TN" "TN-REF-VOP" "TN-REF-WRITE-P" "TN-SC" "TN-VALUE"
               "TRACE-TABLE-ENTRY" "TYPE-CHECK-ERROR" "UNBIND" "UNBIND-TO-HERE"
               "UNSAFE" "UNWIND" "UWP-ENTRY"
-              "VALUE-CELL-REF" "VALUE-CELL-SET"
               "VERIFY-ARGUMENT-COUNT" "WRITE-PACKED-BIT-VECTOR"
               "WRITE-VAR-INTEGER" "WRITE-VAR-STRING" "XEP-ALLOCATE-FRAME"
               "LABEL-ID" "FIXUP" "FIXUP-FLAVOR" "FIXUP-NAME" "FIXUP-OFFSET"
               "FIXUP-P" "MAKE-FIXUP"
               "DEF-ALLOC"
               "VAR-ALLOC"
-              "SAFE-FDEFN-FUNCTION"
+              "SAFE-FDEFN-FUN"
               "NOTE-FIXUP"
               "DEF-REFFER"
               "EMIT-NOP"
               "BLOCK-NUMBER"
               "BACKEND"
               "IR2-BLOCK-BLOCK"
-              "DISASSEM-BYTE-COMPONENT"
               "FUNCALLABLE-INSTANCE-LEXENV"
-              "DISASSEM-BYTE-FUN"
               "VOP-BLOCK"
               "*ASSEMBLY-OPTIMIZE*"
               "LARGE-ALLOC"
-              "%SET-FUNCTION-SELF"
+              "%SET-SIMPLE-FUN-SELF"
               "VM-SUPPORT-ROUTINES-IMMEDIATE-CONSTANT-SC"
               "VM-SUPPORT-ROUTINES-LOCATION-PRINT-NAME"
               "VM-SUPPORT-ROUTINES-PRIMITIVE-TYPE-OF"
              "SHORT" "UNSIGNED-CHAR" "UNSIGNED-INT"
              "UNSIGNED-LONG" "UNSIGNED-SHORT" "VOID"))
 
- #!+sb-dyncount
- #s(sb-cold:package-data
-    :name "SB!DYNCOUNT"
-    :doc "private: some somewhat-stale code for collecting runtime statistics"
-    :use ("CL" "SB!ALIEN-INTERNALS" "SB!ALIEN" "SB!BIGNUM"
-          "SB!EXT" "SB!INT" "SB!KERNEL" "SB!ASSEM" "SB!SYS")
-    :export ("*COLLECT-DYNAMIC-STATISTICS*" "COUNT-ME"
-             "DYNCOUNT-INFO-COUNTS" "DYNCOUNT-INFO-COSTS"
-             "IR2-COMPONENT-DYNCOUNT-INFO"
-             "DYNCOUNT-INFO" "DYNCOUNT-INFO-P"))
-
- #s(sb-cold:package-data
-    :name "SB!FASL"
-    :doc "private: stuff related to FASL load/dump logic (and GENESIS)"
-    :use ("CL" "SB!ALIEN" "SB!ASSEM" "SB!BIGNUM" "SB!C" "SB!C-CALL"
-          "SB!EXT" "SB!INT" "SB!KERNEL" "SB!SYS")
-    :export ("*ASSEMBLER-ROUTINES*"
-             "+BACKEND-FASL-FILE-IMPLEMENTATION+"
-             "*BACKEND-FASL-FILE-TYPE*"
-             "CLOSE-FASL-OUTPUT"
-             "DUMP-ASSEMBLER-ROUTINES"
-             "DUMP-OBJECT"
-             "FASL-CONSTANT-ALREADY-DUMPED-P"
-             "+FASL-FILE-VERSION+"
-             "FASL-DUMP-BYTE-COMPONENT"
-             "FASL-DUMP-COLD-LOAD-FORM" "FASL-DUMP-COMPONENT"
-             "FASL-DUMP-LOAD-TIME-VALUE" "FASL-DUMP-LOAD-TIME-VALUE-LAMBDA"
-             "FASL-DUMP-SOURCE-INFO" "FASL-DUMP-TOP-LEVEL-LAMBDA-CALL"
-             "FASL-NOTE-HANDLE-FOR-CONSTANT"
-             "FASL-OUTPUT" "FASL-OUTPUT-P" "FASL-OUTPUT-STREAM"
-             "FASL-VALIDATE-STRUCTURE"
-             "*!LOAD-TIME-VALUES*"
-             "LOAD-TYPE-PREDICATE"
-             "OPEN-FASL-OUTPUT"
-             "*!REVERSED-COLD-TOPLEVELS*"
-             "*STATIC-FOREIGN-SYMBOLS*"))
-
- ;; This package is a grab bag for things which used to be internal
- ;; symbols in package COMMON-LISP. Lots of these symbols are accessed
- ;; with explicit SB!IMPL:: prefixes in the code. It would be nice to
- ;; reduce the use of this practice, so if symbols from here which are
- ;; accessed that way are found to belong more appropriately in
- ;; an existing package (e.g. KERNEL or SYS or EXT or FASL), I
- ;; (WHN 19990223) encourage maintainers to move them there..
- ;;
- ;; ..except that it's getting so big and crowded that maybe it
- ;; should be split up, too.
- #s(sb-cold:package-data
-    :name "SB!IMPL"
-    :doc "private: a grab bag of implementation details"
-    :use ("CL" "SB!ALIEN" "SB!BIGNUM" "SB!C-CALL" "SB!DEBUG" "SB!EXT"
-          "SB!FASL" "SB!GRAY" "SB!INT" "SB!KERNEL" "SB!SYS"))
-
  #s(sb-cold:package-data
     :name "SB!DEBUG"
     :doc
 debugger interface mixed with various low-level implementation stuff
 like *STACK-TOP-HINT*"
     :use ("CL" "SB!EXT" "SB!INT" "SB!SYS")
-    :export ("*AUTO-EVAL-IN-FRAME*" "*DEBUG-BEGINNER-HELP-P*"
+    :export ("*DEBUG-BEGINNER-HELP-P*"
              "*DEBUG-CONDITION*"
              "*DEBUG-PRINT-LENGTH*" "*DEBUG-PRINT-LEVEL*"
              "*DEBUG-READTABLE*" "*DEBUG-HELP-STRING*"
@@ -389,35 +350,35 @@ like *STACK-TOP-HINT*"
                "DEBUG-SOURCE-CREATED" "DEBUG-SOURCE-COMPILED"
                "DEBUG-SOURCE-START-POSITIONS" "DEBUG-SOURCE"
                "DEBUG-SOURCE-P")
-    :export ("*DEBUGGING-INTERPRETER*" "ACTIVATE-BREAKPOINT"
+    :export ("ACTIVATE-BREAKPOINT"
              "AMBIGUOUS-DEBUG-VARS" "AMBIGUOUS-VARIABLE-NAME" "BREAKPOINT"
              "BREAKPOINT-ACTIVE-P" "BREAKPOINT-HOOK-FUNCTION" "BREAKPOINT-INFO"
              "BREAKPOINT-KIND" "BREAKPOINT-P" "BREAKPOINT-WHAT" "CODE-LOCATION"
-             "CODE-LOCATION-DEBUG-BLOCK" "CODE-LOCATION-DEBUG-FUNCTION"
+             "CODE-LOCATION-DEBUG-BLOCK" "CODE-LOCATION-DEBUG-FUN"
              "CODE-LOCATION-DEBUG-SOURCE" "CODE-LOCATION-FORM-NUMBER"
              "CODE-LOCATION-P" "CODE-LOCATION-TOP-LEVEL-FORM-OFFSET"
              "CODE-LOCATION-UNKNOWN-P" "CODE-LOCATION=" "DEACTIVATE-BREAKPOINT"
              "DEBUG-BLOCK" "DEBUG-BLOCK-ELSEWHERE-P" "DEBUG-BLOCK-P"
              "DEBUG-BLOCK-SUCCESSORS" "DEBUG-CONDITION" "DEBUG-ERROR"
-             "DEBUG-FUNCTION" "DEBUG-FUNCTION-FUNCTION" "DEBUG-FUNCTION-KIND"
-             "DEBUG-FUNCTION-LAMBDA-LIST" "DEBUG-FUNCTION-NAME"
-             "DEBUG-FUNCTION-P" "DEBUG-FUNCTION-START-LOCATION"
-             "DEBUG-FUNCTION-SYMBOL-VARIABLES"
+             "DEBUG-FUN" "DEBUG-FUN-FUN" "DEBUG-FUN-KIND"
+             "DEBUG-FUN-LAMBDA-LIST" "DEBUG-FUN-NAME"
+             "DEBUG-FUN-P" "DEBUG-FUN-START-LOCATION"
+             "DEBUG-FUN-SYMBOL-VARIABLES"
              "DEBUG-SOURCE-ROOT-NUMBER" "DEBUG-VAR"
              "DEBUG-VAR-ID" "DEBUG-VAR-INFO-AVAILABLE"
              "DEBUG-VAR-SYMBOL-NAME" "DEBUG-VAR-P" "DEBUG-VAR-PACKAGE-NAME"
              "DEBUG-VAR-SYMBOL" "DEBUG-VAR-VALID-VALUE"
              "DEBUG-VAR-VALIDITY" "DEBUG-VAR-VALUE"
              "DELETE-BREAKPOINT" "DO-BLOCKS"
-             "DO-DEBUG-BLOCK-LOCATIONS" "DO-DEBUG-FUNCTION-BLOCKS"
-             "DO-DEBUG-FUNCTION-VARIABLES" "EVAL-IN-FRAME"
+             "DO-DEBUG-BLOCK-LOCATIONS" "DO-DEBUG-FUN-BLOCKS"
+             "DO-DEBUG-FUN-VARIABLES"
              "FORM-NUMBER-TRANSLATIONS" "FRAME" "FRAME-CATCHES"
-             "FRAME-CODE-LOCATION" "FRAME-DEBUG-FUNCTION" "FRAME-DOWN"
-             "FRAME-FUNCTION-MISMATCH" "FRAME-NUMBER" "FRAME-P" "FRAME-UP"
-             "FUNCTION-DEBUG-FUNCTION" "FUNCTION-END-COOKIE-VALID-P"
+             "FRAME-CODE-LOCATION" "FRAME-DEBUG-FUN" "FRAME-DOWN"
+             "FRAME-FUN-MISMATCH" "FRAME-NUMBER" "FRAME-P" "FRAME-UP"
+             "FUN-DEBUG-FUN" "FUN-END-COOKIE-VALID-P"
              "INVALID-CONTROL-STACK-POINTER" "INVALID-VALUE"
              "LAMBDA-LIST-UNAVAILABLE" "MAKE-BREAKPOINT" "NO-DEBUG-BLOCKS"
-             "NO-DEBUG-FUNCTION-RETURNS" "NO-DEBUG-INFO" "PREPROCESS-FOR-EVAL"
+             "NO-DEBUG-FUN-RETURNS" "NO-DEBUG-INFO" "PREPROCESS-FOR-EVAL"
              "RETURN-FROM-FRAME" "SOURCE-PATH-CONTEXT"
              "TOP-FRAME" "UNHANDLED-DEBUG-CONDITION" "UNKNOWN-CODE-LOCATION"
              "UNKNOWN-CODE-LOCATION-P" "UNKNOWN-DEBUG-VAR"
@@ -452,7 +413,7 @@ like *STACK-TOP-HINT*"
              "PRIN1-SHORT" "PRINT-BYTES"
              "PRINT-CURRENT-ADDRESS" "PRINT-FIELD" "PRINT-INST"
              "PRINT-INST-USING" "PRINT-NOTES-AND-NEWLINE"
-             "PRINT-WORDS" "SAP-REF-DCHUNK" "SEG-DEBUG-FUNCTION"
+             "PRINT-WORDS" "SAP-REF-DCHUNK" "SEG-DEBUG-FUN"
              "SEG-LENGTH" "SEG-START" "SEGMENT"
              "SET-ADDRESS-PRINTING-RANGE" "SET-DISASSEM-PARAMS"
              "SET-DSTATE-SEGMENT" "SIGN-EXTEND" "SPECIALIZE"
@@ -474,23 +435,59 @@ like *STACK-TOP-HINT*"
              "ADD-OFFS-NOTE-HOOK" "ADD-OFFS-COMMENT-HOOK"
              "DSTATE-CUR-ADDR" "DSTATE-NEXT-ADDR"))
 
- #!+sb-interpreter
+ #!+sb-dyncount
+ #s(sb-cold:package-data
+    :name "SB!DYNCOUNT"
+    :doc "private: some somewhat-stale code for collecting runtime statistics"
+    :use ("CL" "SB!ALIEN-INTERNALS" "SB!ALIEN" "SB!BIGNUM"
+          "SB!EXT" "SB!INT" "SB!KERNEL" "SB!ASSEM" "SB!SYS")
+    :export ("*COLLECT-DYNAMIC-STATISTICS*" "COUNT-ME"
+             "DYNCOUNT-INFO-COUNTS" "DYNCOUNT-INFO-COSTS"
+             "IR2-COMPONENT-DYNCOUNT-INFO"
+             "DYNCOUNT-INFO" "DYNCOUNT-INFO-P"))
+
+ #s(sb-cold:package-data
+    :name "SB!FASL"
+    :doc "private: stuff related to FASL load/dump logic (and GENESIS)"
+    :use ("CL" "SB!ALIEN" "SB!ASSEM" "SB!BIGNUM" "SB!C" "SB!C-CALL"
+          "SB!EXT" "SB!INT" "SB!KERNEL" "SB!SYS")
+    :export ("*ASSEMBLER-ROUTINES*"
+             "+BACKEND-FASL-FILE-IMPLEMENTATION+"
+             "*FASL-FILE-TYPE*"
+             "CLOSE-FASL-OUTPUT"
+             "DUMP-ASSEMBLER-ROUTINES"
+             "DUMP-OBJECT"
+             "FASL-CONSTANT-ALREADY-DUMPED-P"
+             "+FASL-FILE-VERSION+"
+             "FASL-DUMP-COLD-LOAD-FORM" "FASL-DUMP-COMPONENT"
+             "FASL-DUMP-COLD-FSET"
+             "FASL-DUMP-LOAD-TIME-VALUE" "FASL-DUMP-LOAD-TIME-VALUE-LAMBDA"
+             "FASL-DUMP-SOURCE-INFO" "FASL-DUMP-TOP-LEVEL-LAMBDA-CALL"
+             "FASL-NOTE-HANDLE-FOR-CONSTANT"
+             "FASL-OUTPUT" "FASL-OUTPUT-P"
+            "FASL-OUTPUT-ENTRY-TABLE" "FASL-OUTPUT-STREAM"
+             "FASL-VALIDATE-STRUCTURE"
+             "*!LOAD-TIME-VALUES*"
+             "LOAD-TYPE-PREDICATE"
+             "OPEN-FASL-OUTPUT"
+             "*!REVERSED-COLD-TOPLEVELS*"
+             "*STATIC-FOREIGN-SYMBOLS*"))
+
+ ;; This package is a grab bag for things which used to be internal
+ ;; symbols in package COMMON-LISP. Lots of these symbols are accessed
+ ;; with explicit SB!IMPL:: prefixes in the code. It would be nice to
+ ;; reduce the use of this practice, so if symbols from here which are
+ ;; accessed that way are found to belong more appropriately in
+ ;; an existing package (e.g. KERNEL or SYS or EXT or FASL), I
+ ;; (WHN 19990223) encourage maintainers to move them there..
+ ;;
+ ;; ..except that it's getting so big and crowded that maybe it
+ ;; should be split up, too.
  #s(sb-cold:package-data
-    :name "SB!EVAL"
-    :doc "private: the implementation of the IR1 interpreter"
-    :use ("CL" "SB!KERNEL" "SB!INT")
-    :export ("*EVAL-STACK-TRACE*" "*INTERNAL-APPLY-NODE-TRACE*"
-             "FLUSH-INTERPRETED-FUNCTION-CACHE" "INTERNAL-EVAL"
-             "INTERPRETED-FUNCTION"
-             "INTERPRETED-FUNCTION-ARGLIST"
-             "INTERPRETED-FUNCTION-CLOSURE"
-             "INTERPRETED-FUNCTION-LAMBDA-EXPRESSION"
-             "INTERPRETED-FUNCTION-NAME"
-             "INTERPRETED-FUNCTION-P"
-             "INTERPRETED-FUNCTION-TYPE"
-             "MAKE-INTERPRETED-FUNCTION"
-             "PRINT-INTERPRETED-FUNCTION-OBJECT"
-             "TRACE-EVAL"))
+    :name "SB!IMPL"
+    :doc "private: a grab bag of implementation details"
+    :use ("CL" "SB!ALIEN" "SB!BIGNUM" "SB!C-CALL" "SB!DEBUG" "SB!EXT"
+          "SB!FASL" "SB!GRAY" "SB!INT" "SB!KERNEL" "SB!SYS"))
 
  #s(sb-cold:package-data
     :name "SB!EXT"
@@ -517,6 +514,10 @@ like *STACK-TOP-HINT*"
              ;; There is no one right way to do DESCRIBE.
              "*DESCRIBE-INDENTATION-STEP*"
 
+             ;; It can be handy to be able to evaluate expressions involving
+             ;; the thing under examination by CL:INSPECT.
+             "*INSPECTED*"
+
              ;; There is no one right way to do efficiency notes.
              "*EFFICIENCY-NOTE-COST-THRESHOLD*" "*EFFICIENCY-NOTE-LIMIT*"
 
@@ -548,16 +549,16 @@ like *STACK-TOP-HINT*"
              "*USE-IMPLEMENTATION-TYPES*"
              "*BYTE-COMPILE-TOP-LEVEL*"
              "*BYTE-COMPILE-DEFAULT*"
-             "*DERIVE-FUNCTION-TYPES*" ; FIXME FIXME FIXME FIXME..
+             "*DERIVE-FUNCTION-TYPES*"
 
              ;; a special form for breaking out of our "declarations
              ;; are assertions" default
              "TRULY-THE"
 
-             ;; This is something which must exist inside any Common Lisp
-             ;; implementation, and which someone writing a customized toplevel
-             ;; might well want. It seems perverse to hide it from
-             ;; them..
+             ;; This is something which must exist inside any Common
+             ;; Lisp implementation, and which someone writing a
+             ;; customized toplevel might well want. It seems perverse
+             ;; to hide it from them..
              "INTERACTIVE-EVAL"
 
              ;; weak pointers and finalization
@@ -642,6 +643,9 @@ retained, possibly temporariliy, because it might be used internally."
              "*ALL-MODIFIER-NAMES*"
              "*BACKUP-EXTENSION*"
 
+            ;; lambda list keyword extensions
+            "&MORE"
+
              ;; INFO stuff doesn't belong in a user-visible package, we
              ;; should be able to change it without apology.
              "*INFO-ENVIRONMENT*"
@@ -685,6 +689,11 @@ retained, possibly temporariliy, because it might be used internally."
              ;; in the cross-compiler's environment
              "DEF!MACRO" "DEF!METHOD" "DEF!STRUCT" "DEF!TYPE"
 
+             ;; other variations on DEFFOO stuff useful for bootstrapping
+             ;; and cross-compiling
+             "DEFMACRO-MUNDANELY"
+             "DEFCONSTANT-EQX"
+
              ;; messing with PATHNAMEs
              "MAKE-TRIVIAL-DEFAULT-PATHNAME"
              "PHYSICALIZE-PATHNAME"
@@ -699,7 +708,7 @@ retained, possibly temporariliy, because it might be used internally."
              "PCOUNTER->INTEGER"
              "PCOUNTER-OR-FIXNUM->INTEGER"
              "PCOUNTER-P"
-             "*N-BYTES-FREED-OR-PURIFIED-PCOUNTER*"
+             "*N-BYTES-FREED-OR-PURIFIED*"
 
              ;; miscellaneous non-standard but handy user-level functions..
              "ASSQ" "DELQ" "MEMQ" "POSQ" "NEQ"
@@ -716,6 +725,7 @@ retained, possibly temporariliy, because it might be used internally."
              ;; ..and macros..
              "COLLECT"
              "DO-ANONYMOUS" "DOHASH" "DOVECTOR"
+            "NAMED-LAMBDA"
              "NAMED-LET"
              "ONCE-ONLY"
              "DEFENUM"
@@ -749,19 +759,13 @@ retained, possibly temporariliy, because it might be used internally."
              ;; symbol-hacking idioms
              "KEYWORDICATE" "SYMBOLICATE"
 
-             ;; search lists (FIXME: should go away)
-             "ENUMERATE-SEARCH-LIST"
-             "CLEAR-SEARCH-LIST"
-             "SEARCH-LIST"
-             "SEARCH-LIST-DEFINED-P"
-
              ;; certainly doesn't belong in public extensions
              ;; FIXME: maybe belongs in %KERNEL with other typesystem stuff?
              "CONSTANT-ARGUMENT"
 
              ;; various internal defaults
              "*DEFAULT-PACKAGE-USE-LIST*"
-             "DEFAULT-INIT-CHAR"
+             "DEFAULT-INIT-CHAR" "*DEFAULT-INIT-CHAR-FORM*"
              "*LOAD-SOURCE-DEFAULT-TYPE*"
 
              ;; hash caches
@@ -807,13 +811,15 @@ retained, possibly temporariliy, because it might be used internally."
              "C-STRINGS->STRING-LIST"
 
              ;; misc. utilities used internally
-             "LEGAL-FUNCTION-NAME-P"
-             "FUNCTION-NAME-BLOCK-NAME"
+             "LEGAL-FUN-NAME-P"
+             "FUN-NAME-BLOCK-NAME"
+            "FUN-NAME-INLINE-EXPANSION"
              "WHITESPACE-CHAR-P"
              "LISTEN-SKIP-WHITESPACE"
              "PACKAGE-INTERNAL-SYMBOL-COUNT" "PACKAGE-EXTERNAL-SYMBOL-COUNT"
              "PROPER-LIST-OF-LENGTH-P"
              "LIST-OF-LENGTH-AT-LEAST-P"
+             "LIST-WITH-LENGTH-P"
              "READ-SEQUENCE-OR-DIE"
              "RENAME-KEY-ARGS"
              "REQUIRED-ARGUMENT"
@@ -821,9 +827,11 @@ retained, possibly temporariliy, because it might be used internally."
              "FEATUREP"
              "FLUSH-STANDARD-OUTPUT-STREAMS"
              "MAKE-GENSYM-LIST"
-             "DEFCONSTANT-EQX"
              "ABOUT-TO-MODIFY"
+            "SYMBOL-SELF-EVALUATING-P"
              "PRINT-PRETTY-ON-STREAM-P"
+             "LOOKS-LIKE-NAME-OF-SPECIAL-VAR-P"
+             "POSITIVE-PRIMEP" 
 
              ;; These could be moved back into SB!EXT if someone has
              ;; compelling reasons, but hopefully we can get by
@@ -838,7 +846,7 @@ retained, possibly temporariliy, because it might be used internally."
              "UNIX-ENVIRONMENT-CMUCL-FROM-SBCL"
              "UNIX-ENVIRONMENT-SBCL-FROM-CMUCL"
 
-             ;; a sort of quasi unbound tag for use in hash tables
+             ;; a sort of quasi-unbound tag for use in hash tables
              "+EMPTY-HT-SLOT+"
 
              ;; low-level i/o stuff
@@ -856,22 +864,11 @@ retained, possibly temporariliy, because it might be used internally."
              "PREPARE-FOR-FAST-READ-BYTE"
              "PREPARE-FOR-FAST-READ-CHAR"
 
-             ;; not used any more, I think -- WHN 19991206
-             #+nil
-             ("SERVE-BUTTON-PRESS"
-              "SERVE-BUTTON-RELEASE" "SERVE-CIRCULATE-NOTIFY"
-              "SERVE-CIRCULATE-REQUEST" "SERVE-CLIENT-MESSAGE"
-              "SERVE-COLORMAP-NOTIFY" "SERVE-CONFIGURE-NOTIFY"
-              "SERVE-CONFIGURE-REQUEST" "SERVE-CREATE-NOTIFY"
-              "SERVE-DESTROY-NOTIFY" "SERVE-ENTER-NOTIFY" "SERVE-EXPOSURE"
-              "SERVE-FOCUS-IN" "SERVE-FOCUS-OUT" "SERVE-GRAPHICS-EXPOSURE"
-              "SERVE-GRAVITY-NOTIFY" "SERVE-KEY-PRESS" "SERVE-KEY-RELEASE"
-              "SERVE-LEAVE-NOTIFY" "SERVE-MAP-NOTIFY" "SERVE-MAP-REQUEST"
-              "SERVE-MOTION-NOTIFY" "SERVE-NO-EXPOSURE" "SERVE-PROPERTY-NOTIFY"
-              "SERVE-REPARENT-NOTIFY" "SERVE-RESIZE-REQUEST"
-              "SERVE-SELECTION-CLEAR" "SERVE-SELECTION-NOTIFY"
-              "SERVE-SELECTION-REQUEST" "SERVE-UNMAP-NOTIFY"
-              "SERVE-VISIBILITY-NOTIFY")))
+            ;; hackery to help set up for cold init
+             "!BEGIN-COLLECTING-COLD-INIT-FORMS"
+            "!COLD-INIT-FORMS" 
+            "COLD-FSET"
+             "!DEFUN-FROM-COLLECTED-COLD-INIT-FORMS"))
 
  #s(sb-cold:package-data
     :name "SB!ITERATE"
@@ -884,12 +881,18 @@ retained, possibly temporariliy, because it might be used internally."
              "MAXIMIZING" "MINIMIZING" "SUMMING"
              "*ITERATE-WARNINGS*"))
 
+ ;; FIXME: This package is awfully huge. It'd probably be good to
+ ;; split it. There's at least one natural way to split it: the
+ ;; implementation of the Lisp type system (e.g. TYPE-INTERSECTION and
+ ;; SPECIFIER-TYPE) could move to a separate package SB!TYPE. (There's
+ ;; lots of stuff which currently uses the SB!KERNEL package which
+ ;; doesn't actually use the type system stuff.)
  #s(sb-cold:package-data
     :name "SB!KERNEL"
     :doc
 "private: Theoretically this 'hides state and types used for package
 integration' (said CMU CL architecture.tex) and that probably was and
-is a good idea, but see SB-SYS for blurring of boundaries."
+is a good idea, but see SB-SYS re. blurring of boundaries."
     :use ("CL" "SB!ALIEN" "SB!ALIEN-INTERNALS" "SB!BIGNUM"
           "SB!EXT" "SB!FASL" "SB!INT" "SB!SYS" "SB!GRAY")
     :import-from (("SB!C-CALL" "VOID"))
@@ -901,10 +904,12 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              "%ARRAY-FILL-POINTER-P"
              "%ASIN" "%ASINH"
              "%ATAN" "%ATAN2" "%ATANH"
-             "%CALLER-FRAME-AND-PC" "%CHECK-BOUND" "%CLOSURE-FUNCTION"
+             "%CALLER-FRAME-AND-PC" "%CHECK-BOUND" "%CLOSURE-FUN"
              "%CLOSURE-INDEX-REF" "%COS" "%COS-QUICK"
              "%COSH" "%DEPOSIT-FIELD"
              "%DOUBLE-FLOAT" "%DPB" "%EXP" "%EXPM1"
+             "%FIND-POSITION" "%FIND-POSITION-VECTOR-MACRO"
+             "%FIND-POSITION-IF" "%FIND-POSITION-IF-VECTOR-MACRO"
              "%HYPOT" "%INSTANCE-SET-CONDITIONAL" "%LDB"
              "%LOG" "%LOGB" "%LOG10" "%LOG1P" "%LONG-FLOAT"
              "%MAKE-COMPLEX" "%MAKE-FUNCALLABLE-INSTANCE" "%MAKE-RATIO"
@@ -918,7 +923,7 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              "%RAW-REF-SINGLE" "%RAW-SET-COMPLEX-DOUBLE"
              "%RAW-SET-COMPLEX-LONG" "%RAW-SET-COMPLEX-SINGLE"
              "%RAW-SET-DOUBLE" "%RAW-SET-LONG" "%RAW-SET-SINGLE"
-             "%SCALB" "%SCALBN" "%SET-FUNCALLABLE-INSTANCE-FUNCTION"
+             "%SCALB" "%SCALBN" "%SET-FUNCALLABLE-INSTANCE-FUN"
              "%SET-FUNCALLABLE-INSTANCE-INFO" "%SET-RAW-BITS"
              "%SET-SAP-REF-16" "%SET-SAP-REF-32" "%SET-SAP-REF-64"
              "%SET-SAP-REF-8" "%SET-SAP-REF-DOUBLE" "%SET-SAP-REF-LONG"
@@ -931,13 +936,14 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              "%SQRT" "%SXHASH-SIMPLE-STRING"
              "%SXHASH-SIMPLE-SUBSTRING" "%TAN" "%TAN-QUICK"
              "%TANH" "%UNARY-ROUND" "%UNARY-TRUNCATE"
-             "%WITH-ARRAY-DATA" "WITH-ARRAY-DATA"
+             "%WITH-ARRAY-DATA" "%WITH-ARRAY-DATA-MACRO" 
              "*ALREADY-MAYBE-GCING*"
              "*CURRENT-LEVEL*" "*EMPTY-TYPE*"
-             "*EVAL-STACK-TOP*" "*GC-INHIBIT*"
+             "*EVAL-STACK*" "*EVAL-STACK-TOP*" "*GC-INHIBIT*"
              "*NEED-TO-COLLECT-GARBAGE*"
              "*PRETTY-PRINTER*" "*UNIVERSAL-TYPE*"
-             "*UNPARSE-FUNCTION-TYPE-SIMPLIFY*" "*WILD-TYPE*"
+             "*UNIVERSAL-FUN-TYPE*"
+             "*UNPARSE-FUN-TYPE-SIMPLIFY*" "*WILD-TYPE*"
              "32BIT-LOGICAL-AND" "32BIT-LOGICAL-ANDC1"
              "32BIT-LOGICAL-ANDC2"
              "32BIT-LOGICAL-EQV" "32BIT-LOGICAL-NAND"
@@ -957,7 +963,6 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              "ARRAY-TYPE-P"
              "ARRAY-TYPE-SPECIALIZED-ELEMENT-TYPE" "ASH-INDEX"
              "ASSERT-ERROR" "BASE-CHAR-P"
-             "!BEGIN-COLLECTING-COLD-INIT-FORMS"
              "BINDING-STACK-POINTER-SAP" "BIT-BASH-AND"
              "BIT-BASH-ANDC1"
              "BIT-BASH-ANDC2" "BIT-BASH-CLEAR" "BIT-BASH-COPY"
@@ -977,11 +982,11 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              "CODE-COMPONENT" "CODE-COMPONENT-P"
              "CODE-DEBUG-INFO" "CODE-HEADER-REF" "CODE-HEADER-SET"
              "CODE-INSTRUCTIONS"
-             "COERCE-TO-BIT-VECTOR" "COERCE-TO-FUNCTION"
+             "COERCE-TO-BIT-VECTOR" "COERCE-TO-FUNCTION" "COERCE-TO-LEXENV"
              "COERCE-TO-LIST" "COERCE-TO-SIMPLE-STRING"
              "COERCE-TO-SIMPLE-VECTOR" "COERCE-TO-VECTOR"
              "*COLD-INIT-COMPLETE-P*"
-             "!COLD-INIT-FORMS" "COMPLEX-DOUBLE-FLOAT-P"
+             "COMPLEX-DOUBLE-FLOAT-P"
              "COMPLEX-FLOAT-P" "COMPLEX-LONG-FLOAT-P"
              "COMPLEX-RATIONAL-P" "COMPLEX-SINGLE-FLOAT-P" "COMPLEX-VECTOR-P"
              "COMPOUND-TYPE" "COMPOUND-TYPE-P" "COMPOUND-TYPE-TYPES"
@@ -1004,23 +1009,23 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              "DOUBLE-FLOAT-INT-EXPONENT" "DOUBLE-FLOAT-LOW-BITS"
              "DOUBLE-FLOAT-SIGNIFICAND"
              "DOUBLE-FLOAT-P" "FLOAT-WAIT"
-             "DYNAMIC-SPACE-FREE-POINTER"
-             "!DEFUN-FROM-COLLECTED-COLD-INIT-FORMS"
-             "ERROR-NUMBER-OR-LOSE" "FDEFINITION-OBJECT"
+             "DYNAMIC-SPACE-FREE-POINTER" "DYNAMIC-USAGE"
+             "ERROR-NUMBER-OR-LOSE"
+             "FAILED-%WITH-ARRAY-DATA"
+             "FDEFINITION-OBJECT"
              "FDOCUMENTATION" "FILENAME"
              "FIND-AND-INIT-OR-CHECK-LAYOUT"
              "FLOAT-EXPONENT" "FLOAT-FORMAT-DIGITS" "FLOAT-FORMAT-NAME"
              "FLOAT-FORMAT-MAX" "FLOATING-POINT-EXCEPTION"
              "FORM" "*FREE-INTERRUPT-CONTEXT-INDEX*" "FUNCALLABLE-INSTANCE-P"
-             "FUNCTION-CODE-HEADER" "FUNCTION-DOC"
-             "FUNCTION-TYPE"
-             "FUNCTION-TYPE-ALLOWP"
-             "FUNCTION-TYPE-KEYP" "FUNCTION-TYPE-KEYWORDS"
-             "FUNCTION-TYPE-NARGS" "FUNCTION-TYPE-OPTIONAL"
-             "FUNCTION-TYPE-P"
-             "FUNCTION-TYPE-REQUIRED" "FUNCTION-TYPE-REST"
-             "FUNCTION-TYPE-RETURNS" "FUNCTION-TYPE-WILD-ARGS"
-             "FUNCTION-WORD-OFFSET" "GET-CLOSURE-LENGTH"
+             "FUN-CODE-HEADER" "FUNCTION-DOC"
+             "FUN-TYPE" "FUN-TYPE-ALLOWP"
+             "FUN-TYPE-KEYP" "FUN-TYPE-KEYWORDS"
+             "FUN-TYPE-NARGS" "FUN-TYPE-OPTIONAL"
+             "FUN-TYPE-P"
+             "FUN-TYPE-REQUIRED" "FUN-TYPE-REST"
+             "FUN-TYPE-RETURNS" "FUN-TYPE-WILD-ARGS"
+             "FUN-WORD-OFFSET" "GET-CLOSURE-LENGTH"
              "GET-HEADER-DATA"
              "GET-LISP-OBJ-ADDRESS" "GET-LOWTAG"
              "GET-TYPE"
@@ -1028,6 +1033,7 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              "HAIRY-TYPE-CHECK-TEMPLATE-NAME" "HAIRY-TYPE-SPECIFIER"
              "HANDLE-CIRCULARITY" "IGNORE-IT"
              "ILL-BIN" "ILL-BOUT" "ILL-IN" "ILL-OUT"
+             "INDEX-OR-MINUS-1"
              "INDEX-TOO-LARGE-ERROR"
              "*!INITIAL-ASSEMBLER-ROUTINES*"
              "*!INITIAL-FDEFN-OBJECTS*" "*!INITIAL-FOREIGN-SYMBOLS*"
@@ -1060,16 +1066,17 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              "LRA" "LRA-CODE-HEADER" "LRA-P"
              "MAKE-ALIEN-TYPE-TYPE" "MAKE-ARGS-TYPE"
              "MAKE-ARRAY-HEADER" "MAKE-ARRAY-TYPE" "MAKE-CONS-TYPE"
-             "MAKE-DOUBLE-FLOAT" "MAKE-FUNCTION-TYPE"
+             "MAKE-DOUBLE-FLOAT" "MAKE-FUN-TYPE"
              "MAKE-KEY-INFO" "MAKE-LISP-OBJ" "MAKE-LONG-FLOAT"
              "MAKE-MEMBER-TYPE" "MAKE-NAMED-TYPE"
              "MAKE-NULL-LEXENV" "MAKE-NUMERIC-TYPE"
              "MAKE-SINGLE-FLOAT" "MAKE-SPECIALIZABLE-ARRAY"
              "%MAKE-INSTANCE"
+            "MAKE-VALUE-CELL"
              "MAKE-VALUES-TYPE"
              "MAYBE-GC" "MEMBER-TYPE" "MEMBER-TYPE-MEMBERS"
              "MEMBER-TYPE-P" "MERGE-BITS" "MODIFIED-NUMERIC-TYPE"
-             "DEFMACRO-MUNDANELY" "MUTATOR-SELF"
+             "MUTATOR-SELF"
              "NAMED-TYPE" "NAMED-TYPE-NAME" "NAMED-TYPE-P"
              "NATIVE-BYTE-ORDER" "NEGATE"
              "NEVER-SUBTYPEP" "NIL-FUNCTION-RETURNED-ERROR"
@@ -1139,7 +1146,6 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              #+x86 "*PSEUDO-ATOMIC-INTERRUPTED*"
              "PUNT-PRINT-IF-TOO-LONG"
              "READER-PACKAGE-ERROR"
-             #!+gengc "*SAVED-STATE-CHAIN*"
              "SCALE-DOUBLE-FLOAT" "SCALE-LONG-FLOAT"
              "SCALE-SINGLE-FLOAT"
              "SEQUENCE-END" "SEQUENCE-OF-CHECKED-LENGTH-GIVEN-TYPE"
@@ -1174,7 +1180,6 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              "STRING-TO-SIMPLE-STRING"
              "SYSTEM-AREA-CLEAR"
              "SYSTEM-AREA-COPY" "TWO-ARG-*"
-             "TRY-TO-RENAME-INTERPRETED-FUNCTION-AS-MACRO"
              "TWO-ARG-+" "TWO-ARG--"
              "TWO-ARG-/" "TWO-ARG-/=" "TWO-ARG-<"
              "TWO-ARG-<=" "TWO-ARG-="
@@ -1192,7 +1197,9 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              "UNKNOWN-KEY-ARGUMENT-ERROR"
              "UNKNOWN-TYPE" "UNKNOWN-TYPE-P"
              "UNKNOWN-TYPE-SPECIFIER" "UNSEEN-THROW-TAG-ERROR"
-             "UNSIGNED-BYTE-32-P" "VALUES-SPECIFIER-TYPE"
+             "UNSIGNED-BYTE-32-P"
+            "VALUE-CELL-REF" "VALUE-CELL-SET"
+            "VALUES-SPECIFIER-TYPE"
              "VALUES-SPECIFIER-TYPE-CACHE-CLEAR" "VALUES-SUBTYPEP"
              "VALUES-TYPE"
              "VALUES-TYPE-INTERSECTION" "VALUES-TYPE-KEYP"
@@ -1203,11 +1210,12 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              "VECTOR-TO-VECTOR*" "VECTOR-TO-SIMPLE-STRING*"
              "VECTOR-TO-BIT-VECTOR*" "VECTOR-TO-SIMPLE-BIT-VECTOR*"
              "VECTOR-OF-CHECKED-LENGTH-GIVEN-LENGTH"
+             "WITH-ARRAY-DATA"
              "WITH-CIRCULARITY-DETECTION" "WITH-TYPE-CACHES"
              "WRONG-NUMBER-OF-INDICES-ERROR"
 
              "FDEFN" "MAKE-FDEFN" "FDEFN-P"
-             "FDEFN-NAME" "FDEFN-FUNCTION"
+             "FDEFN-NAME" "FDEFN-FUN"
              "FDEFN-MAKUNBOUND" "%COERCE-NAME-TO-FUNCTION"
              "%COERCE-CALLABLE-TO-FUNCTION"
              "FUNCTION-SUBTYPE" "*MAXIMUM-ERROR-DEPTH*"
@@ -1219,11 +1227,9 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              "INVOKE-MACROEXPAND-HOOK"
              "DEFAULT-STRUCTURE-PRINT"
              "LAYOUT" "LAYOUT-LENGTH"
-             "LAMBDA-WITH-ENVIRONMENT" "LAYOUT-PURE" "DSD-RAW-TYPE"
-             "%COMPILER-DEFSTRUCT"
-             "%COMPILER-ONLY-DEFSTRUCT" "FUNCTION-%COMPILER-ONLY-DEFSTRUCT"
+             "LAYOUT-PURE" "DSD-RAW-TYPE"
              "DEFSTRUCT-DESCRIPTION" "UNDEFINE-STRUCTURE"
-             "DD-COPIER" "UNDEFINE-FUNCTION-NAME" "DD-TYPE"
+             "DD-COPIER" "UNDEFINE-FUN-NAME" "DD-TYPE"
              "CLASS-STATE" "INSTANCE"
              "*TYPE-SYSTEM-INITIALIZED*" "FIND-LAYOUT"
              "DSD-NAME" "%TYPEP" "DD-RAW-INDEX"
@@ -1231,48 +1237,46 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              "CLASS-LAYOUT" "CLASS-%NAME"
              "DD-RAW-LENGTH" "NOTE-NAME-DEFINED"
              "%CODE-CODE-SIZE" "DD-SLOTS"
-             "%IMAGPART" "DSD-ACCESSOR"
+             "%IMAGPART" "DSD-ACCESSOR-NAME"
              "%CODE-DEBUG-INFO" "DSD-%NAME"
              "LAYOUT-CLASS" "LAYOUT-INVALID"
-             "%FUNCTION-NAME" "DSD-TYPE" "%INSTANCEP"
-             "DEFSTRUCT-SLOT-DESCRIPTION" "%FUNCTION-ARGLIST"
-             "%FUNCTION-NEXT" "LAYOUT-CLOS-HASH-LENGTH" "DD-PREDICATE"
+             "%SIMPLE-FUN-NAME" "DSD-TYPE" "%INSTANCEP"
+             "DEFSTRUCT-SLOT-DESCRIPTION" "%SIMPLE-FUN-ARGLIST"
+             "%SIMPLE-FUN-NEXT" "LAYOUT-CLOS-HASH-LENGTH" "DD-PREDICATE-NAME"
              "CLASS-PROPER-NAME" "%NOTE-TYPE-DEFINED" "LAYOUT-INFO"
              "%SET-INSTANCE-LAYOUT" "DD-DEFAULT-CONSTRUCTOR"
-             "LAYOUT-OF" "%FUNCTION-SELF" "%REALPART"
+             "LAYOUT-OF" "%SIMPLE-FUN-SELF" "%REALPART"
              "STRUCTURE-CLASS-P" "DSD-INDEX"
              "%INSTANCE-LAYOUT" "LAYOUT-CLOS-HASH"
-             "%FUNCTION-TYPE" "PROCLAIM-AS-FUNCTION-NAME"
-             "BECOME-DEFINED-FUNCTION-NAME"
-             "%%COMPILER-DEFSTRUCT" "%NUMERATOR" "CLASS-TYPEP"
+             "%SIMPLE-FUN-TYPE" "PROCLAIM-AS-FUN-NAME"
+             "BECOME-DEFINED-FUN-NAME"
+             "%NUMERATOR" "CLASS-TYPEP"
              "STRUCTURE-CLASS-PRINT-FUNCTION" "DSD-READ-ONLY"
              "LAYOUT-INHERITS" "DD-LENGTH" "%CODE-ENTRY-POINTS"
              "%DENOMINATOR"
-             "BYTE-FUNCTION-OR-CLOSURE" "MAKE-STANDARD-CLASS"
-             "BYTE-FUNCTION-NAME" "CLASS-CELL-TYPEP" "BYTE-CLOSURE"
-             "FIND-CLASS-CELL" "EXTRACT-FUNCTION-TYPE"
+             "MAKE-STANDARD-CLASS"
+             "CLASS-CELL-TYPEP" 
+             "FIND-CLASS-CELL" "EXTRACT-FUN-TYPE"
              "FUNCALLABLE-STRUCTURE-CLASS"
              "%RANDOM-DOUBLE-FLOAT" "%RANDOM-LONG-FLOAT"
              "%RANDOM-SINGLE-FLOAT"
              "RANDOM-PCL-CLASS" "BASIC-STRUCTURE-CLASS-PRINT-FUNCTION"
-             "%FUNCALLABLE-INSTANCE-INFO" "*EVAL-STACK*" "RANDOM-CHUNK"
+             "%FUNCALLABLE-INSTANCE-INFO" "RANDOM-CHUNK"
              "MAKE-FUNCALLABLE-STRUCTURE-CLASS" "LAYOUT-CLOS-HASH-MAX"
              "CLASS-CELL-NAME" "BUILT-IN-CLASS-DIRECT-SUPERCLASSES"
-             "INITIALIZE-BYTE-COMPILED-FUNCTION"
              "RANDOM-LAYOUT-CLOS-HASH"
              "CLASS-PCL-CLASS" "FUNCALLABLE-STRUCTURE"
-             "FUNCALLABLE-INSTANCE-FUNCTION"
+             "FUNCALLABLE-INSTANCE-FUN"
              "%FUNCALLABLE-INSTANCE-LAYOUT"
-             "BASIC-STRUCTURE-CLASS" "BYTE-CLOSURE-DATA"
-             "BYTE-CLOSURE-FUNCTION" "BYTE-FUNCTION" "CLASS-CELL-CLASS"
+             "BASIC-STRUCTURE-CLASS" 
+             "CLASS-CELL-CLASS"
              "FUNCALLABLE-STRUCTURE-CLASS-P" "REGISTER-LAYOUT"
              "FUNCALLABLE-INSTANCE" "RANDOM-FIXNUM-MAX"
              "MAKE-RANDOM-PCL-CLASS" "INSTANCE-LAMBDA"
              "%FUNCALLABLE-INSTANCE-LEXENV" "%MAKE-SYMBOL"
-             "%FUNCALLABLE-INSTANCE-FUNCTION" "SYMBOL-HASH"
+             "%FUNCALLABLE-INSTANCE-FUN" "SYMBOL-HASH"
 
              "MAKE-UNDEFINED-CLASS" "CLASS-DIRECT-SUPERCLASSES" "MAKE-LAYOUT"
-             "BYTE-FUNCTION-TYPE"
              "REDEFINE-LAYOUT-WARNING" "SLOT-CLASS"
              "INSURED-FIND-CLASS" "ORDER-LAYOUT-INHERITS"
              "STD-COMPUTE-CLASS-PRECEDENCE-LIST"
@@ -1415,7 +1419,7 @@ definitely not guaranteed to be present in later versions of SBCL."
              "REMOVE-DEPENDENT"
              "REMOVE-DIRECT-METHOD"
              "REMOVE-DIRECT-SUBCLASS"
-             "SET-FUNCALLABLE-INSTANCE-FUNCTION"
+             "SET-FUNCALLABLE-INSTANCE-FUN"
              "SLOT-BOUNDP-USING-CLASS"
              "SLOT-DEFINITION-ALLOCATION"
              "SLOT-DEFINITION-INITARGS"
@@ -1454,7 +1458,9 @@ definitely not guaranteed to be present in later versions of SBCL."
 necessary for system interfacing\" (said cmu-user.tex at the time
 of the SBCL code fork). That probably was and is a good idea, but in
 practice, the distinctions between this package and SB-KERNEL
-and even SB-VM seem to have become somewhat blurred over the years."
+and even SB-VM seem to have become somewhat blurred over the years.
+Some anomalies (e.g. FIND-IF-IN-CLOSURE being in SB-SYS instead of
+SB-KERNEL) have been undone, but probably more remain."
     :use ("CL" "SB!EXT" "SB!INT")
     :export ("%ASSEMBLER-CODE-TYPE" "%BIND-ALIGNED-SAP"
              ;; FIXME: %PRIMITIVE shouldn't be here. (I now know that %SYS
@@ -1478,7 +1484,7 @@ and even SB-VM seem to have become somewhat blurred over the years."
              "DO-DO-BODY" "DOUBLE-FLOAT-RADIX"
              "ENABLE-INTERRUPT" "ENUMERATION"
              "FD-STREAM" "FD-STREAM-FD"
-             "FD-STREAM-P" "FIND-IF-IN-CLOSURE"
+             "FD-STREAM-P" 
              "FOREIGN-SYMBOL-ADDRESS" "FOREIGN-SYMBOL-ADDRESS-AS-INTEGER"
              "GET-PAGE-SIZE" "GET-SYSTEM-INFO"
              "IGNORE-INTERRUPT"
@@ -1488,7 +1494,7 @@ and even SB-VM seem to have become somewhat blurred over the years."
              "OBJECT-SET-OPERATION"
              "OS-COLD-INIT-OR-REINIT" "OS-CONTEXT-T" "OUTPUT-RAW-BYTES"
              "PARSE-BODY" "POINTER"
-             "POINTER<" "POINTER>" "PORT" "POSITIVE-PRIMEP" 
+             "POINTER<" "POINTER>" "PORT" 
              "READ-N-BYTES" "REALLOCATE-SYSTEM-MEMORY" "RECORD-SIZE"
              "REMOVE-FD-HANDLER" "REMOVE-PORT-DEATH-HANDLER"
              "REMOVE-PORT-OBJECT"
@@ -1575,10 +1581,10 @@ no guarantees of interface stability."
              "WS-YPIXEL" "W_OK" "X_OK" "SIGSYS" "TCSETPGRP" "FD-ZERO"
              "SIGQUIT" "SIGCHLD" "SIGSEGV" "FD-CLR" "SIGUSR2"
              "EALREADY" "SIGPIPE" "CHECK" "SIGXCPU" "EOPNOTSUPP"
-             "SIGFPE" "SIGHUP" "ENOTSOCK" "SIGMASK" "EINTR"
+             "SIGFPE" "SIGHUP" "ENOTSOCK" "EINTR"
              "SIGCONT" "UNIX-RESOLVE-LINKS" "SIGKILL" "EMSGSIZE" "ERANGE"
              "EPROTOTYPE" "UNIX-SIGNAL-NUMBER" "EPFNOSUPPORT" "SIGILL"
-             "EDOM" "UNIX-SIGPAUSE" "EDQUOT" "FD-SETSIZE" "SIGTSTP"
+             "EDOM" "EDQUOT" "FD-SETSIZE" "SIGTSTP"
              "EAFNOSUPPORT" "TCGETPGRP" "EMFILE" "ECONNRESET"
              "EADDRNOTAVAIL" "SIGALRM" "ENETDOWN" "EVICEOP"
              "UNIX-FAST-GETRUSAGE" "EPERM" "SIGINT" "EXDEV" "EDEADLK"
@@ -1586,14 +1592,14 @@ no guarantees of interface stability."
              "EUSERS" "SIGVTALRM" "ENOTCONN" "ESUCCESS" "EPIPE"
              "UNIX-SIMPLIFY-PATHNAME" "EISCONN" "FD-ISSET"
              "ESHUTDOWN" "EBUSY" "SIGTERM" "ENAMETOOLONG" "EMLINK"
-             "EADDRINUSE" "SIGBUS" "ERESTART" "TTY-PROCESS-GROUP"
+             "EADDRINUSE" "SIGBUS" "ERESTART" 
              "UNIX-SIGNAL-NAME" "ETIMEDOUT" "ECHILD" "EFBIG" "SIGTRAP"
              "UNIX-KILLPG" "ENOTBLK" "SIGIOT" "SIGUSR1" "ECONNABORTED"
              "EHOSTUNREACH" "EBADF" "EINVAL" "FD-SET" "EISDIR"
              "SIGTTIN" "UNIX-KILL" "EHOSTDOWN" "E2BIG" "ESPIPE"
              "UNIX-FAST-SELECT" "ENXIO" "ENOTTY" "ELOOP" "LTCHARS"
              "SIGXFSZ" "EINPROGRESS" "ENOENT"
-             "EPROTONOSUPPORT" "UNIX-SIGBLOCK" "SIGIO" "ENOMEM" "SIGEMT"
+             "EPROTONOSUPPORT" "SIGIO" "ENOMEM" "SIGEMT"
              "EFAULT" "ENODEV" "EIO" "EVICEERR" "ETXTBSY" "EWOULDBLOCK"
              "EAGAIN" "EDESTADDRREQ" "ENOEXEC" "ENETUNREACH" "ENOTEMPTY"
              "ENFILE"
@@ -1664,34 +1670,34 @@ structure representations"
              "ARRAY-DISPLACED-P-SLOT" "ARRAY-DISPLACEMENT-SLOT"
              "ARRAY-ELEMENTS-SLOT" "ARRAY-FILL-POINTER-P-SLOT"
              "ARRAY-FILL-POINTER-SLOT" "ATOMIC-FLAG" "BASE-CHAR-REG-SC-NUMBER"
-             "BASE-CHAR-STACK-SC-NUMBER" "BASE-CHAR-TYPE"
-             "BIGNUM-DIGITS-OFFSET" "BIGNUM-TYPE" "BINDING-SIZE"
+             "BASE-CHAR-STACK-SC-NUMBER" "BASE-CHAR-WIDETAG"
+             "BIGNUM-DIGITS-OFFSET" "BIGNUM-WIDETAG" "BINDING-SIZE"
              "BINDING-SYMBOL-SLOT" "BINDING-VALUE-SLOT" "BREAKPOINT-TRAP"
-             "BYTE-CODE-CLOSURE-TYPE" "BYTE-CODE-FUNCTION-TYPE"
-             "BYTE-BITS" "BYTE-REG-SC-NUMBER"
+             "N-BYTE-BITS" "BYTE-REG-SC-NUMBER"
              "CATCH-BLOCK-CURRENT-CODE-SLOT"
              "CATCH-BLOCK-CURRENT-CONT-SLOT" "CATCH-BLOCK-CURRENT-UWP-SLOT"
              "CATCH-BLOCK-ENTRY-PC-SLOT" "CATCH-BLOCK-PREVIOUS-CATCH-SLOT"
              "CATCH-BLOCK-SC-NUMBER" "CATCH-BLOCK-SIZE" "CATCH-BLOCK-SIZE-SLOT"
              "CATCH-BLOCK-TAG-SLOT" "CERROR-TRAP"
-             "CLOSURE-FUNCTION-HEADER-TYPE" "CLOSURE-FUNCTION-SLOT"
-             "CLOSURE-HEADER-TYPE" "CLOSURE-INFO-OFFSET"
+             "CLOSURE-FUN-HEADER-WIDETAG" "CLOSURE-FUN-SLOT"
+             "CLOSURE-HEADER-WIDETAG" "CLOSURE-INFO-OFFSET"
              "CODE-CODE-SIZE-SLOT" "CODE-CONSTANTS-OFFSET"
-             "CODE-DEBUG-INFO-SLOT" "CODE-ENTRY-POINTS-SLOT" "CODE-HEADER-TYPE"
-             "CODE-TRACE-TABLE-OFFSET-SLOT" "COMPLEX-ARRAY-TYPE"
-             "COMPLEX-BIT-VECTOR-TYPE" "COMPLEX-DOUBLE-FLOAT-FILLER-SLOT"
+             "CODE-DEBUG-INFO-SLOT" "CODE-ENTRY-POINTS-SLOT"
+            "CODE-HEADER-WIDETAG"
+             "CODE-TRACE-TABLE-OFFSET-SLOT" "COMPLEX-ARRAY-WIDETAG"
+             "COMPLEX-BIT-VECTOR-WIDETAG" "COMPLEX-DOUBLE-FLOAT-FILLER-SLOT"
              "COMPLEX-DOUBLE-FLOAT-IMAG-SLOT" "COMPLEX-DOUBLE-FLOAT-REAL-SLOT"
-             "COMPLEX-DOUBLE-FLOAT-SIZE" "COMPLEX-DOUBLE-FLOAT-TYPE"
+             "COMPLEX-DOUBLE-FLOAT-SIZE" "COMPLEX-DOUBLE-FLOAT-WIDETAG"
              "COMPLEX-DOUBLE-REG-SC-NUMBER" "COMPLEX-DOUBLE-STACK-SC-NUMBER"
              "COMPLEX-IMAG-SLOT" "COMPLEX-REAL-SLOT"
              "COMPLEX-LONG-FLOAT-IMAG-SLOT" "COMPLEX-LONG-FLOAT-REAL-SLOT"
-             "COMPLEX-LONG-FLOAT-SIZE" "COMPLEX-LONG-FLOAT-TYPE"
+             "COMPLEX-LONG-FLOAT-SIZE" "COMPLEX-LONG-FLOAT-WIDETAG"
              "COMPLEX-LONG-REG-SC-NUMBER" "COMPLEX-LONG-STACK-SC-NUMBER"
              "COMPLEX-SINGLE-FLOAT-IMAG-SLOT" "COMPLEX-SINGLE-FLOAT-REAL-SLOT"
-             "COMPLEX-SINGLE-FLOAT-SIZE" "COMPLEX-SINGLE-FLOAT-TYPE"
+             "COMPLEX-SINGLE-FLOAT-SIZE" "COMPLEX-SINGLE-FLOAT-WIDETAG"
              "COMPLEX-SINGLE-REG-SC-NUMBER" "COMPLEX-SINGLE-STACK-SC-NUMBER"
-             "COMPLEX-SIZE" "COMPLEX-STRING-TYPE" "COMPLEX-TYPE"
-             "COMPLEX-VECTOR-TYPE" "CONS-CAR-SLOT" "CONS-CDR-SLOT"
+             "COMPLEX-SIZE" "COMPLEX-STRING-WIDETAG" "COMPLEX-WIDETAG"
+             "COMPLEX-VECTOR-WIDETAG" "CONS-CAR-SLOT" "CONS-CDR-SLOT"
              "CONS-SIZE" "CONSTANT-SC-NUMBER"
              "CONTEXT-FLOATING-POINT-MODES" "CONTEXT-FLOAT-REGISTER"
              "CONTEXT-PC" "CONTEXT-REGISTER"
@@ -1705,13 +1711,13 @@ structure representations"
              "DOUBLE-FLOAT-NORMAL-EXPONENT-MAX"
              "DOUBLE-FLOAT-NORMAL-EXPONENT-MIN" "DOUBLE-FLOAT-SIGNIFICAND-BYTE"
              "DOUBLE-FLOAT-SIZE" "DOUBLE-FLOAT-TRAPPING-NAN-BIT"
-             "DOUBLE-FLOAT-TYPE" "DOUBLE-FLOAT-VALUE-SLOT"
+             "DOUBLE-FLOAT-WIDETAG" "DOUBLE-FLOAT-VALUE-SLOT"
              "DOUBLE-INT-CARG-REG-SC-NUMBER" "DOUBLE-REG-SC-NUMBER"
              "DOUBLE-STACK-SC-NUMBER"
-             "ERROR-TRAP" "EVEN-FIXNUM-TYPE"
+             "ERROR-TRAP" "EVEN-FIXNUM-LOWTAG"
              "EXPORTED-STATIC-SYMBOLS" "EXTERN-ALIEN-NAME"
-             "FDEFN-FUNCTION-SLOT" "FDEFN-NAME-SLOT" "FDEFN-RAW-ADDR-SLOT"
-             "FDEFN-SIZE" "FDEFN-TYPE" "FIND-HOLES" "FIXNUMIZE"
+             "FDEFN-FUN-SLOT" "FDEFN-NAME-SLOT" "FDEFN-RAW-ADDR-SLOT"
+             "FDEFN-SIZE" "FDEFN-WIDETAG" "FIND-HOLES" "FIXNUMIZE"
              "FIXUP-CODE-OBJECT" "FLOAT-DENORMAL-TRAP-BIT"
              "FLOAT-DIVIDE-BY-ZERO-TRAP-BIT"
              "FLOAT-IMPRECISE-TRAP-BIT" "FLOAT-INVALID-TRAP-BIT"
@@ -1720,73 +1726,87 @@ structure representations"
              "FORWARDING-POINTER-TYPE"
              "FP-CONSTANT-SC-NUMBER"
              "FP-DOUBLE-ZERO-SC-NUMBER" "FP-SINGLE-ZERO-SC-NUMBER"
-             "FUNCALLABLE-INSTANCE-FUNCTION-SLOT"
-             "FUNCALLABLE-INSTANCE-HEADER-TYPE"
+             "FUNCALLABLE-INSTANCE-FUN-SLOT"
+             "FUNCALLABLE-INSTANCE-HEADER-WIDETAG"
              "FUNCALLABLE-INSTANCE-INFO-OFFSET"
-             "FUNCTION-ARGLIST-SLOT" "FUNCTION-CODE-OFFSET"
-             "FUNCTION-END-BREAKPOINT-TRAP"
-             "FUNCTION-HEADER-CODE-OFFSET"
-             "FUNCTION-HEADER-NEXT-SLOT" "FUNCTION-HEADER-SELF-SLOT"
-             "FUNCTION-HEADER-TYPE" "FUNCTION-HEADER-TYPE-SLOT"
-             "FUNCTION-NAME-SLOT" "FUNCTION-NEXT-SLOT" "FUNCTION-POINTER-TYPE"
-             "FUNCTION-SELF-SLOT" "FUNCTION-TYPE-SLOT"
+             "SIMPLE-FUN-ARGLIST-SLOT" "SIMPLE-FUN-CODE-OFFSET"
+             "FUN-END-BREAKPOINT-TRAP"
+             "SIMPLE-FUN-HEADER-CODE-OFFSET"
+             "SIMPLE-FUN-HEADER-NEXT-SLOT"
+            "SIMPLE-FUN-HEADER-SELF-SLOT"
+             "SIMPLE-FUN-HEADER-WIDETAG"
+            "SIMPLE-FUN-HEADER-TYPE-SLOT"
+             "SIMPLE-FUN-NAME-SLOT"
+            "SIMPLE-FUN-NEXT-SLOT"
+            "FUN-POINTER-LOWTAG"
+             "SIMPLE-FUN-SELF-SLOT"
+            "SIMPLE-FUN-TYPE-SLOT"
              "FUNCALLABLE-INSTANCE-LAYOUT-SLOT"
              "FUNCALLABLE-INSTANCE-LEXENV-SLOT"
              "GENESIS" "HALT-TRAP" "IGNORE-ME-SC-NUMBER"
              "IMMEDIATE-BASE-CHAR-SC-NUMBER" "IMMEDIATE-SAP-SC-NUMBER"
              "IMMEDIATE-SC-NUMBER" "*INITIAL-DYNAMIC-SPACE-FREE-POINTER*"
-             "INSTANCE-HEADER-TYPE" "INSTANCE-POINTER-TYPE"
+             "INSTANCE-HEADER-WIDETAG" "INSTANCE-POINTER-LOWTAG"
              "INSTANCE-SLOTS-OFFSET" "INSTANCE-USAGE"
              "INTERIOR-REG-SC-NUMBER" "INTERNAL-ERROR-ARGUMENTS"
-             "INTERRUPTED-FLAG" "LIST-ALLOCATED-OBJECTS" "LIST-POINTER-TYPE"
+             "INTERRUPTED-FLAG" "LIST-ALLOCATED-OBJECTS" "LIST-POINTER-LOWTAG"
              "LONG-FLOAT-BIAS" "LONG-FLOAT-DIGITS" "LONG-FLOAT-EXPONENT-BYTE"
              "LONG-FLOAT-HIDDEN-BIT" "LONG-FLOAT-NORMAL-EXPONENT-MAX"
              "LONG-FLOAT-NORMAL-EXPONENT-MIN" "LONG-FLOAT-SIGNIFICAND-BYTE"
-             "LONG-FLOAT-SIZE" "LONG-FLOAT-TRAPPING-NAN-BIT" "LONG-FLOAT-TYPE"
+             "LONG-FLOAT-SIZE" "LONG-FLOAT-TRAPPING-NAN-BIT"
+            "LONG-FLOAT-WIDETAG"
              "LONG-FLOAT-VALUE-SLOT" "LONG-REG-SC-NUMBER"
              "LONG-STACK-SC-NUMBER"
-             "LOWTAG-BITS" "LOWTAG-LIMIT" "LOWTAG-MASK"
+             "LOWTAG-LIMIT" "LOWTAG-MASK"
+            "LRA-SAVE-OFFSET"
              "MEMORY-USAGE" "MOST-POSITIVE-COST"
-             "NEGATIVE-IMMEDIATE-SC-NUMBER" "NON-DESCRIPTOR-REG-SC-NUMBER"
-             "NULL-SC-NUMBER" "OBJECT-NOT-LIST-TRAP" "OBJECT-NOT-INSTANCE-TRAP"
-             "ODD-FIXNUM-TYPE" "OFFSET-STATIC-SYMBOL" "OTHER-IMMEDIATE-0-TYPE"
-             "OTHER-IMMEDIATE-1-TYPE" "OTHER-POINTER-TYPE"
+            "N-LOWTAG-BITS" 
+             "NEGATIVE-IMMEDIATE-SC-NUMBER"
+            "NFP-SAVE-OFFSET"
+            "NON-DESCRIPTOR-REG-SC-NUMBER"
+             "NULL-SC-NUMBER"
+            "OBJECT-NOT-LIST-TRAP" "OBJECT-NOT-INSTANCE-TRAP"
+            "OCFP-SAVE-OFFSET"
+             "ODD-FIXNUM-LOWTAG"
+            "OFFSET-STATIC-SYMBOL" "OTHER-IMMEDIATE-0-LOWTAG"
+             "OTHER-IMMEDIATE-1-LOWTAG" "OTHER-POINTER-LOWTAG"
              "PAD-DATA-BLOCK" "PENDING-INTERRUPT-TRAP"
-             "PRIMITIVE-OBJECT" "PRIMITIVE-OBJECT-HEADER"
+             "PRIMITIVE-OBJECT" "PRIMITIVE-OBJECT-WIDETAG"
              "PRIMITIVE-OBJECT-LOWTAG" "PRIMITIVE-OBJECT-NAME"
              "PRIMITIVE-OBJECT-OPTIONS" "PRIMITIVE-OBJECT-P"
              "PRIMITIVE-OBJECT-SIZE" "PRIMITIVE-OBJECT-SLOTS"
              "PRIMITIVE-OBJECT-VARIABLE-LENGTH" "PRINT-ALLOCATED-OBJECTS"
              "RANDOM-IMMEDIATE-SC-NUMBER" "RATIO-DENOMINATOR-SLOT"
-             "RATIO-NUMERATOR-SLOT" "RATIO-SIZE" "RATIO-TYPE"
+             "RATIO-NUMERATOR-SLOT" "RATIO-SIZE" "RATIO-WIDETAG"
              "*READ-ONLY-SPACE-FREE-POINTER*"
-             "REGISTER-SAVE-PENALTY" "RETURN-PC-HEADER-TYPE"
+             "REGISTER-SAVE-PENALTY" "RETURN-PC-HEADER-WIDETAG"
              "RETURN-PC-RETURN-POINT-OFFSET" "SANCTIFY-FOR-EXECUTION"
              "SAP-POINTER-SLOT" "SAP-REG-SC-NUMBER" "SAP-SIZE"
-             "SAP-STACK-SC-NUMBER" "SAP-TYPE"
+             "SAP-STACK-SC-NUMBER" "SAP-WIDETAG"
              "SIGFPE-HANDLER" "SIGNED-REG-SC-NUMBER" "SIGNED-STACK-SC-NUMBER"
-             "SIMPLE-ARRAY-COMPLEX-DOUBLE-FLOAT-TYPE"
-             "SIMPLE-ARRAY-COMPLEX-LONG-FLOAT-TYPE"
-             "SIMPLE-ARRAY-COMPLEX-SINGLE-FLOAT-TYPE"
-             "SIMPLE-ARRAY-DOUBLE-FLOAT-TYPE"
-             "SIMPLE-ARRAY-LONG-FLOAT-TYPE"
-             "SIMPLE-ARRAY-SINGLE-FLOAT-TYPE"
-             "SIMPLE-ARRAY-TYPE" "SIMPLE-ARRAY-UNSIGNED-BYTE-16-TYPE"
-             "SIMPLE-ARRAY-UNSIGNED-BYTE-2-TYPE"
-             "SIMPLE-ARRAY-UNSIGNED-BYTE-32-TYPE"
-             "SIMPLE-ARRAY-UNSIGNED-BYTE-4-TYPE"
-             "SIMPLE-ARRAY-UNSIGNED-BYTE-8-TYPE"
-             "SIMPLE-ARRAY-SIGNED-BYTE-16-TYPE"
-             "SIMPLE-ARRAY-SIGNED-BYTE-30-TYPE"
-             "SIMPLE-ARRAY-SIGNED-BYTE-32-TYPE"
-             "SIMPLE-ARRAY-SIGNED-BYTE-8-TYPE"
-             "SIMPLE-BIT-VECTOR-TYPE"
-             "SIMPLE-STRING-TYPE" "SIMPLE-VECTOR-TYPE" "SINGLE-FLOAT-BIAS"
+             "SIMPLE-ARRAY-COMPLEX-DOUBLE-FLOAT-WIDETAG"
+             "SIMPLE-ARRAY-COMPLEX-LONG-FLOAT-WIDETAG"
+             "SIMPLE-ARRAY-COMPLEX-SINGLE-FLOAT-WIDETAG"
+             "SIMPLE-ARRAY-DOUBLE-FLOAT-WIDETAG"
+             "SIMPLE-ARRAY-LONG-FLOAT-WIDETAG"
+             "SIMPLE-ARRAY-SINGLE-FLOAT-WIDETAG"
+             "SIMPLE-ARRAY-WIDETAG" "SIMPLE-ARRAY-UNSIGNED-BYTE-16-WIDETAG"
+             "SIMPLE-ARRAY-UNSIGNED-BYTE-2-WIDETAG"
+             "SIMPLE-ARRAY-UNSIGNED-BYTE-32-WIDETAG"
+             "SIMPLE-ARRAY-UNSIGNED-BYTE-4-WIDETAG"
+             "SIMPLE-ARRAY-UNSIGNED-BYTE-8-WIDETAG"
+             "SIMPLE-ARRAY-SIGNED-BYTE-16-WIDETAG"
+             "SIMPLE-ARRAY-SIGNED-BYTE-30-WIDETAG"
+             "SIMPLE-ARRAY-SIGNED-BYTE-32-WIDETAG"
+             "SIMPLE-ARRAY-SIGNED-BYTE-8-WIDETAG"
+             "SIMPLE-BIT-VECTOR-WIDETAG"
+             "SIMPLE-STRING-WIDETAG"
+            "SIMPLE-VECTOR-WIDETAG" "SINGLE-FLOAT-BIAS"
              "SINGLE-FLOAT-DIGITS" "SINGLE-FLOAT-EXPONENT-BYTE"
              "SINGLE-FLOAT-HIDDEN-BIT" "SINGLE-FLOAT-NORMAL-EXPONENT-MAX"
              "SINGLE-FLOAT-NORMAL-EXPONENT-MIN" "SINGLE-FLOAT-SIGNIFICAND-BYTE"
              "SINGLE-FLOAT-SIZE" "SINGLE-FLOAT-TRAPPING-NAN-BIT"
-             "SINGLE-FLOAT-TYPE" "SINGLE-FLOAT-VALUE-SLOT"
+             "SINGLE-FLOAT-WIDETAG" "SINGLE-FLOAT-VALUE-SLOT"
              "SINGLE-INT-CARG-REG-SC-NUMBER"
              "SINGLE-REG-SC-NUMBER" "SINGLE-STACK-SC-NUMBER"
              "SINGLE-STEP-BREAKPOINT-TRAP"
@@ -1795,10 +1815,9 @@ structure representations"
              "SLOT-REST-P" "*STATIC-FUNCTIONS*" "STATIC-FUNCTION-OFFSET"
              "STATIC-SYMBOL-OFFSET" "STATIC-SYMBOL-P"
              "*STATIC-SPACE-FREE-POINTER*" "*STATIC-SYMBOLS*"
-             "STRUCTURE-USAGE" "SYMBOL-FUNCTION-SLOT"
-             "SYMBOL-HASH-SLOT" "SYMBOL-HEADER-TYPE" "SYMBOL-NAME-SLOT"
+             "STRUCTURE-USAGE"
+             "SYMBOL-HASH-SLOT" "SYMBOL-HEADER-WIDETAG" "SYMBOL-NAME-SLOT"
              "SYMBOL-PACKAGE-SLOT" "SYMBOL-PLIST-SLOT"
-             "SYMBOL-RAW-FUNCTION-ADDR-SLOT" "SYMBOL-SETF-FUNCTION-SLOT"
              "SYMBOL-SIZE" "SYMBOL-UNUSED-SLOT" "SYMBOL-VALUE-SLOT"
              "BINDING-STACK-START" "BINDING-STACK-END" 
              "CONTROL-STACK-START" "CONTROL-STACK-END"
@@ -1814,18 +1833,21 @@ structure representations"
              "STATIC-SPACE-START" "STATIC-SPACE-END"
              "TRACE-TABLE-CALL-SITE"
              "TRACE-TABLE-FUNCTION-EPILOGUE" "TRACE-TABLE-FUNCTION-PROLOGUE"
-             "TRACE-TABLE-NORMAL" "TYPE-BITS" "TYPE-MASK" "UNBOUND-MARKER-TYPE"
+             "TRACE-TABLE-NORMAL" "N-WIDETAG-BITS" "WIDETAG-MASK"
+            "UNBOUND-MARKER-WIDETAG"
              "UNSIGNED-IMMEDIATE-SC-NUMBER"
              "UNSIGNED-REG-SC-NUMBER" "UNSIGNED-STACK-SC-NUMBER"
              "UNWIND-BLOCK-CURRENT-CODE-SLOT" "UNWIND-BLOCK-CURRENT-CONT-SLOT"
              "UNWIND-BLOCK-CURRENT-UWP-SLOT" "UNWIND-BLOCK-ENTRY-PC-SLOT"
-             "UNWIND-BLOCK-SIZE" "VALUE-CELL-HEADER-TYPE" "VALUE-CELL-SIZE"
+             "UNWIND-BLOCK-SIZE" "VALUE-CELL-HEADER-WIDETAG" "VALUE-CELL-SIZE"
              "VALUE-CELL-VALUE-SLOT" "VECTOR-DATA-OFFSET" "VECTOR-LENGTH-SLOT"
              "VECTOR-MUST-REHASH-SUBTYPE" "VECTOR-NORMAL-SUBTYPE"
              "VECTOR-VALID-HASHING-SUBTYPE"
              "WEAK-POINTER-BROKEN-SLOT" "WEAK-POINTER-NEXT-SLOT"
-             "WEAK-POINTER-SIZE" "WEAK-POINTER-TYPE" "WEAK-POINTER-VALUE-SLOT"
-             "WORD" "WORD-BITS" "WORD-BYTES" "WORD-REG-SC-NUMBER" "WORD-SHIFT"
+             "WEAK-POINTER-SIZE" "WEAK-POINTER-WIDETAG"
+            "WEAK-POINTER-VALUE-SLOT"
+             "WORD" "N-WORD-BITS" "N-WORD-BYTES"
+            "WORD-REG-SC-NUMBER" "WORD-SHIFT"
              "ZERO-SC-NUMBER"))
 
  #s(sb-cold:package-data