0.7.1.3:
[sbcl.git] / package-data-list.lisp-expr
index 6c6343c..581a10e 100644 (file)
@@ -3,14 +3,15 @@
 ;;;; 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
+;;;;   * any SHADOWing and nickname hackery
 ;;;;   * 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.
+;;;; cross-compilation, in order to avoid collision with possible
+;;;; corresponding SB-FOO packages in the cross-compilation host.
+;;;; They're renamed to SB-FOO later, after we've departed from the xc
+;;;; mothership and the danger of namespace collision is past.
 
 ;;;; This software is part of the SBCL system. See the README file for
 ;;;; more information.
 
 (#s(sb-cold:package-data
     :name "SB!ALIEN"
-    :doc "public: the ALIEN foreign function interface"
+    :doc "public: the ALIEN foreign function interface (If you're
+porting CMU CL code, note that this package corresponds roughly to a union
+of the packages ALIEN and C-CALL at the time of the SBCL fork. SB-C-CALL
+is a deprecated nickname to help ease the transition from older versions
+of SBCL which maintained the CMU-CL-style split into two packages.)"
     :use ("CL" "SB!EXT" "SB!INT" "SB!SYS" "SB!ALIEN-INTERNALS")
-    :reexport ("ARRAY" "BOOLEAN" "DOUBLE-FLOAT" "LONG-FLOAT" "FUNCTION"
-               "INTEGER" "SINGLE-FLOAT" "UNION"  "SYSTEM-AREA-POINTER"
-               "VALUES" "*")
+    :reexport ("ARRAY" "BOOLEAN" "CHAR" "DOUBLE-FLOAT"
+              "FLOAT" "FUNCTION" "INTEGER" "LONG-FLOAT"
+              "SINGLE-FLOAT"
+              ;; FIXME: Do we really want to reexport
+              ;; SYSTEM-AREA-POINTER here? Why?
+              "SYSTEM-AREA-POINTER"
+               "UNION"  "VALUES" "*")
     :export ("ADDR" "ALIEN" "ALIEN-FUNCALL" "ALIEN-SAP" "ALIEN-SIZE" 
-            "CAST"
-            "DEF-ALIEN-ROUTINE" "DEF-ALIEN-TYPE"
-            "DEF-ALIEN-VARIABLE" "DEF-BUILTIN-ALIEN-TYPE"
-             "DEREF"
+            "CAST" "C-STRING"
+            "DEFINE-ALIEN-ROUTINE" "DEFINE-ALIEN-TYPE" "DEFINE-ALIEN-VARIABLE"
+
+            ;; FIXME: These old names don't match the DEFFOO - vs. -
+            ;; DEFINE-FOO convention used in the ANSI spec, and so
+            ;; were deprecated in sbcl-0.7.0. After a year or so
+            ;; they can go away completely.
+            "DEF-ALIEN-ROUTINE" "DEF-ALIEN-TYPE" "DEF-ALIEN-VARIABLE"
+
+             "DEREF" "DOUBLE"
             "ENUM" "EXTERN-ALIEN"
-            "FREE-ALIEN" 
-             "LOAD-FOREIGN" "LOAD-1-FOREIGN"
+            "FREE-ALIEN"
+            "GET-ERRNO"
+            "INT" 
+             "LOAD-FOREIGN" "LOAD-1-FOREIGN" "LONG"
             "MAKE-ALIEN"
             "NULL-ALIEN"
-             "SAP-ALIEN" "SIGNED" "SLOT" "STRUCT"
+             "SAP-ALIEN" "SHORT" "SIGNED" "SLOT" "STRUCT"
              "UNSIGNED"
+            "UNSIGNED-CHAR" "UNSIGNED-INT" "UNSIGNED-LONG" "UNSIGNED-SHORT"
+            "VOID"
             "WITH-ALIEN"))
 
  #s(sb-cold:package-data
@@ -54,9 +73,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"
              "ALIEN-VALUES-TYPE-VALUES" "ALIGN-OFFSET" "COMPUTE-ALIEN-REP-TYPE"
              "COMPUTE-DEPORT-LAMBDA" "COMPUTE-DEPOSIT-LAMBDA"
              "COMPUTE-EXTRACT-LAMBDA" "COMPUTE-LISP-REP-TYPE"
-             "COMPUTE-NATURALIZE-LAMBDA" "DEF-ALIEN-TYPE-CLASS"
-             "DEF-ALIEN-TYPE-METHOD" "DEF-ALIEN-TYPE-TRANSLATOR" "DEPORT"
+             "COMPUTE-NATURALIZE-LAMBDA" "DEFINE-ALIEN-TYPE-CLASS"
+             "DEFINE-ALIEN-TYPE-METHOD" "DEFINE-ALIEN-TYPE-TRANSLATOR" "DEPORT"
              "DEPOSIT-ALIEN-VALUE" "DISPOSE-LOCAL-ALIEN" "EXTRACT-ALIEN-VALUE"
              "HEAP-ALIEN-INFO" "HEAP-ALIEN-INFO-P" "HEAP-ALIEN-INFO-SAP-FORM"
              "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"
               "*BACKEND-SB-LIST*" "*BACKEND-SB-NAMES*"
               "*BACKEND-SC-NAMES*" "*BACKEND-SC-NUMBERS*"
               "*BACKEND-SPECIAL-ARG-TYPES*"
+              "*BACKEND-SUBFEATURES*"
               "*BACKEND-T-PRIMITIVE-TYPE*"
 
               "*CODE-SEGMENT*" 
-              "*COUNT-VOP-USAGES*" "*ELSEWHERE*" "*FREE-FUNCTIONS*"
+              "*COUNT-VOP-USAGES*" "*ELSEWHERE*" "*FREE-FUNS*"
               "*SETF-ASSUMED-FBOUNDP*"
               "*SUPPRESS-VALUES-DECLARATION*"
 
               "ALLOC-ALIEN-STACK-SPACE" "ALLOC-NUMBER-STACK-SPACE"
               "ALLOCATE-CODE-OBJECT" "ALLOCATE-FRAME"
               "ALLOCATE-DYNAMIC-CODE-OBJECT" "ALLOCATE-FULL-CALL-FRAME"
-              "ANY" "ARGUMENT-COUNT-ERROR" "ASSEMBLE-FILE"
+              "ANY" "ARG-COUNT-ERROR" "ASSEMBLE-FILE"
               "ATTRIBUTES" "ATTRIBUTES-INTERSECTION" "ATTRIBUTES-UNION"
               "ATTRIBUTES=" "BIND"
               "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-FUN"
               "CHECK-SIGNED-BYTE-32" "CHECK-SYMBOL" "CHECK-UNSIGNED-BYTE-32"
               "CLOSURE-INIT" "CLOSURE-REF"
               "CODE-CONSTANT-REF" "CODE-CONSTANT-SET" 
              "COMPILE-LAMBDA-FOR-DEFUN"
               "%COMPILER-DEFUN" "COMPILER-ERROR"
               "COMPONENT" "COMPONENT-HEADER-LENGTH"
-              "COMPONENT-INFO" "COMPONENT-LIVE-TN" "COMPUTE-FUNCTION"
+              "COMPONENT-INFO" "COMPONENT-LIVE-TN" "COMPUTE-FUN"
               "COMPUTE-OLD-NFP" "COPY-MORE-ARG" 
               "CURRENT-BINDING-POINTER" "CURRENT-NFP-TN"
               "CURRENT-STACK-POINTER" "DEALLOC-ALIEN-STACK-SPACE"
               "DEALLOC-NUMBER-STACK-SPACE" "DEF-BOOLEAN-ATTRIBUTE"
               "DEF-IR1-TRANSLATOR"
               "!DEF-PRIMITIVE-TYPE" "!DEF-PRIMITIVE-TYPE-ALIAS"
-              "DEF-SOURCE-TRANSFORM" "!DEF-VM-SUPPORT-ROUTINE"
-              "DEFINE-ASSEMBLY-ROUTINE" "DEFINE-MOVE-FUNCTION"
+              "DEFINE-SOURCE-TRANSFORM" "!DEF-VM-SUPPORT-ROUTINE"
+              "DEFINE-ASSEMBLY-ROUTINE" "DEFINE-MOVE-FUN"
               "DEFINE-MOVE-VOP" "DEFINE-STORAGE-BASE"
               "DEFINE-STORAGE-CLASS" "DEFINE-VOP"
               "DEFKNOWN" "DEFOPTIMIZER"
               "DEFTRANSFORM" "DERIVE-TYPE"
               "ENTRY-NODE-INFO-NLX-TAG" "ENTRY-NODE-INFO-ST-TOP"
-              "ENVIRONMENT-DEBUG-LIVE-TN" "ENVIRONMENT-LIVE-TN"
-              "FAST-SYMBOL-FUNCTION" "FAST-SYMBOL-VALUE" "FOLDABLE"
+              "PHYSENV-DEBUG-LIVE-TN" "PHYSENV-LIVE-TN"
+              "FAST-SYMBOL-VALUE" "FOLDABLE"
               "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"
+              "IR2-PHYSENV-NUMBER-STACK-P"
              "KNOWN-CALL-LOCAL" "KNOWN-RETURN"
              "LAMBDA-INDEPENDENT-OF-LEXENV-P"
              "LAMBDA-WITH-LEXENV" "LOCATION=" "LTN-ANNOTATE"
               "RESET-STACK-POINTER" "RESTORE-DYNAMIC-STATE"
               "RETURN-MULTIPLE" "SAVE-DYNAMIC-STATE" "SB"
               "SB-ALLOCATED-SIZE" "SB-NAME" "SB-OR-LOSE" "SB-P" "SC" "SC-CASE"
-              "SC-IS" "SC-NAME" "SC-NUMBER" "SC-NUMBER-OR-LOSE"
+              "SC-IS" "SC-NAME" "SC-NUMBER" "SC-NUMBER-OR-LOSE" "SC-OFFSET"
               "SC-OFFSET-OFFSET" "SC-OFFSET-SCN" "SC-OR-LOSE" "SC-P" "SC-SB"
               "SET-UNWIND-PROTECT" "SET-VECTOR-SUBTYPE"
               "SETUP-CLOSURE-ENVIRONMENT" "SETUP-ENVIRONMENT"
               "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"
-              "VERIFY-ARGUMENT-COUNT" "WRITE-PACKED-BIT-VECTOR"
+              "VERIFY-ARG-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"
               "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"
               "VM-SUPPORT-ROUTINES-PRIMITIVE-TYPE"
               "VM-SUPPORT-ROUTINES-MAKE-CALL-OUT-TNS"
-              "VM-SUPPORT-ROUTINES-STANDARD-ARGUMENT-LOCATION"
+              "VM-SUPPORT-ROUTINES-STANDARD-ARG-LOCATION"
               "VM-SUPPORT-ROUTINES-MAKE-RETURN-PC-PASSING-LOCATION"
               "VM-SUPPORT-ROUTINES-MAKE-OLD-FP-PASSING-LOCATION"
               "VM-SUPPORT-ROUTINES-MAKE-OLD-FP-SAVE-LOCATION"
               "VM-SUPPORT-ROUTINES-MAKE-RETURN-PC-SAVE-LOCATION"
-              "VM-SUPPORT-ROUTINES-MAKE-ARGUMENT-COUNT-LOCATION"
+              "VM-SUPPORT-ROUTINES-MAKE-ARG-COUNT-LOCATION"
               "VM-SUPPORT-ROUTINES-MAKE-NFP-TN"
               "VM-SUPPORT-ROUTINES-MAKE-STACK-POINTER-TN"
               "VM-SUPPORT-ROUTINES-MAKE-NUMBER-STACK-POINTER-TN"
               "VM-SUPPORT-ROUTINES-SELECT-COMPONENT-FORMAT"
               "VM-SUPPORT-ROUTINES-MAKE-NLX-SP-TN"
               "VM-SUPPORT-ROUTINES-MAKE-DYNAMIC-STATE-TNS"
-              "VM-SUPPORT-ROUTINES-MAKE-NLX-ENTRY-ARGUMENT-START-LOCATION"
+              "VM-SUPPORT-ROUTINES-MAKE-NLX-ENTRY-ARG-START-LOCATION"
               "VM-SUPPORT-ROUTINES-GENERATE-CALL-SEQUENCE"
               "VM-SUPPORT-ROUTINES-GENERATE-RETURN-SEQUENCE"
               "VM-SUPPORT-ROUTINES-EMIT-NOP"
               "VM-SUPPORT-ROUTINES-LOCATION-NUMBER"))
 
  #s(sb-cold:package-data
-    :name "SB!C-CALL"
-    ;; FIXME: Why not just put this stuff into SB-ALIEN? Or maybe
-    ;; just glom this and SB-ALIEN together into SB-FFI?
-    :doc "public: some types used with ALIENs"
-    :use ("CL" "SB!SYS" "SB!ALIEN-INTERNALS" "SB!ALIEN" "SB!INT" "SB!EXT")
-    :reexport ("FLOAT" "CHAR")
-    :export ("C-STRING" "DOUBLE" "GET-ERRNO" "INT" "LONG"
-             "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+"
-             "*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!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
-"public: (eventually) the debugger interface (but currently) the
-debugger interface mixed with various low-level implementation stuff
-like *STACK-TOP-HINT*"
+"sorta public: Eventually this should become the debugger interface, with
+basic stuff like BACKTRACE and ARG. For now, the actual supported interface
+is still mixed indiscriminately with low-level internal implementation stuff
+like *STACK-TOP-HINT* and unsupported stuff like *TRACED-FUN-LIST*."
     :use ("CL" "SB!EXT" "SB!INT" "SB!SYS")
     :export ("*DEBUG-BEGINNER-HELP-P*"
              "*DEBUG-CONDITION*"
@@ -382,8 +338,7 @@ like *STACK-TOP-HINT*"
              "*DEBUG-READTABLE*" "*DEBUG-HELP-STRING*"
              "*FLUSH-DEBUG-ERRORS*" "*IN-THE-DEBUGGER*"
              "*TRACE-INDENTATION-STEP*" "*MAX-TRACE-INDENTATION*"
-             "*TRACE-FRAME*" "*TRACE-PRINT-LENGTH*"
-             "*TRACE-PRINT-LEVEL*" "*TRACED-FUNCTION-LIST*"
+             "*TRACE-FRAME*" "*TRACED-FUN-LIST*"
              "ARG" "BACKTRACE" "INTERNAL-DEBUG" "VAR"
              "*PRINT-LOCATION-KIND*"
              "*ONLY-BLOCK-START-LOCATIONS*" "*STACK-TOP-HINT*"
@@ -404,34 +359,35 @@ like *STACK-TOP-HINT*"
                "DEBUG-SOURCE-START-POSITIONS" "DEBUG-SOURCE"
                "DEBUG-SOURCE-P")
     :export ("ACTIVATE-BREAKPOINT"
-             "AMBIGUOUS-DEBUG-VARS" "AMBIGUOUS-VARIABLE-NAME" "BREAKPOINT"
-             "BREAKPOINT-ACTIVE-P" "BREAKPOINT-HOOK-FUNCTION" "BREAKPOINT-INFO"
+             "AMBIGUOUS-DEBUG-VARS" "AMBIGUOUS-VAR-NAME" "BREAKPOINT"
+             "BREAKPOINT-ACTIVE-P" "BREAKPOINT-HOOK-FUN" "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-P" "CODE-LOCATION-TOPLEVEL-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-VARS"
              "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"
-             "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"
+             "DO-DEBUG-BLOCK-LOCATIONS" "DO-DEBUG-FUN-BLOCKS"
+             "DO-DEBUG-FUN-VARS"
+             "FORM-NUMBER-TRANSLATIONS"
+            "FRAME" "FRAME-CATCHES" "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"
@@ -447,14 +403,14 @@ like *STACK-TOP-HINT*"
              "ADD-COMMENT-HOOK" "ADD-HOOK" "ADD-NOTE-HOOK"
              "ARG-VALUE" "CREATE-DSTATE" "DISASSEM-STATE"
              "DISASSEMBLE-CODE-COMPONENT"
-             "DISASSEMBLE-FUNCTION" "DISASSEMBLE-MEMORY"
+             "DISASSEMBLE-FUN" "DISASSEMBLE-MEMORY"
              "DISASSEMBLE-SEGMENT" "DISASSEMBLE-SEGMENTS"
              "DSTATE-CODE" "DSTATE-CURPOS" "DSTATE-GET-PROP"
              "DSTATE-NEXTPOS" "DSTATE-SEGMENT-LENGTH"
              "DSTATE-SEGMENT-SAP" "DSTATE-SEGMENT-START"
              "FIELD-TYPE" "FIND-INST" "GEN-FIELD-TYPE-DECL-FORM"
              "GEN-INST-DECL-FORM" "GEN-INST-FORMAT-DECL-FORM"
-             "GET-CODE-SEGMENTS" "GET-FUNCTION-SEGMENTS"
+             "GET-CODE-SEGMENTS" "GET-FUN-SEGMENTS"
              "GET-INST-SPACE" "HANDLE-BREAK-ARGS"
              "INST" "INST-FORMAT" "LABEL-SEGMENTS"
              "MAYBE-NOTE-ASSEMBLER-ROUTINE"
@@ -466,12 +422,12 @@ 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"
              "GEN-PRINTER-DEF-FORMS-DEF-FORM" "MAKE-DSTATE"
-             "DEFINE-ARGUMENT-TYPE" "GEN-ARG-TYPE-DEF-FORM"
+             "DEFINE-ARG-TYPE" "GEN-ARG-TYPE-DEF-FORM"
              "READ-SIGNED-SUFFIX" "ADD-OFFS-HOOK"
              "MAKE-MEMORY-SEGMENT" "GEN-PREAMBLE-FORM"
              "MAKE-SEGMENT" "SEGMENT-OVERFLOW"
@@ -488,12 +444,64 @@ like *STACK-TOP-HINT*"
              "ADD-OFFS-NOTE-HOOK" "ADD-OFFS-COMMENT-HOOK"
              "DSTATE-CUR-ADDR" "DSTATE-NEXT-ADDR"))
 
+ #!+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!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-TOPLEVEL-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!IMPL"
+    :doc "private: a grab bag of implementation details"
+    :use ("CL" "SB!ALIEN" "SB!BIGNUM" "SB!DEBUG" "SB!EXT"
+          "SB!FASL" "SB!GRAY" "SB!INT" "SB!KERNEL" "SB!SYS"))
+
  #s(sb-cold:package-data
     :name "SB!EXT"
     :doc "public: miscellaneous supported extensions to the ANSI Lisp spec"
-    ;; FIXME: Why don't we just USE-PACKAGE %KERNEL here instead of importing?
-    :use ("CL" "SB!ALIEN" "SB!C-CALL" "SB!INT" "SB!SYS" "SB!GRAY")
-    :reexport ("LOAD-FOREIGN" "LOAD-1-FOREIGN")
+    :use ("CL" "SB!ALIEN" "SB!INT" "SB!SYS" "SB!GRAY")
     :export (;; Information about how the program was invoked is
              ;; nonstandard but very useful.
              "*POSIX-ARGV*" "POSIX-GETENV" "POSIX-ENVIRON"
@@ -526,7 +534,13 @@ like *STACK-TOP-HINT*"
 
              ;; and for dedicated users who really want to customize
              ;; error reporting, we have
-             "DEF-SOURCE-CONTEXT"
+             "DEFINE-SOURCE-CONTEXT"
+
+            ;; FIXME: This name doesn't match the DEFFOO - vs. -
+            ;; DEFINE-FOO convention used in the ANSI spec, and so
+            ;; was deprecated in sbcl-0.pre7, ca. 2001-12-12. After
+            ;; a year or so it can go away completely.
+            "DEF-SOURCE-CONTEXT"
 
              ;; FIXME: These seem like the right thing, but are they
              ;; consistent with ANSI? (And actually maybe they're not
@@ -546,8 +560,6 @@ like *STACK-TOP-HINT*"
              ;; ..and variables to control compiler policy
              "*INLINE-EXPANSION-LIMIT*"
              "*USE-IMPLEMENTATION-TYPES*"
-             "*BYTE-COMPILE-TOP-LEVEL*"
-             "*BYTE-COMPILE-DEFAULT*"
              "*DERIVE-FUNCTION-TYPES*"
 
              ;; a special form for breaking out of our "declarations
@@ -627,21 +639,20 @@ Lisp extension proposal by David N. Gray"
              "STREAM-FRESH-LINE" "STREAM-LINE-COLUMN" "STREAM-LINE-LENGTH"
              "STREAM-LISTEN" "STREAM-PEEK-CHAR" "STREAM-READ-BYTE"
              "STREAM-READ-CHAR" "STREAM-READ-CHAR-NO-HANG" "STREAM-READ-LINE"
-             "STREAM-START-LINE-P" "STREAM-TERPRI" "STREAM-UNREAD-CHAR"
-             "STREAM-WRITE-BYTE" "STREAM-WRITE-CHAR" "STREAM-WRITE-STRING"))
+             "STREAM-READ-SEQUENCE" "STREAM-START-LINE-P" "STREAM-TERPRI"
+             "STREAM-UNREAD-CHAR"
+             "STREAM-WRITE-BYTE" "STREAM-WRITE-CHAR" "STREAM-WRITE-SEQUENCE"
+             "STREAM-WRITE-STRING"))
 
  #s(sb-cold:package-data
     :name "SB!INT"
     :doc
-"private: miscellaneous unsupported extensions to the ANSI spec. Most of
+"private: miscellaneous unsupported extensions to the ANSI spec. Much of
 the stuff in here originated in CMU CL's EXTENSIONS package and is
 retained, possibly temporariliy, because it might be used internally."
-    :use ("CL" "SB!ALIEN" "SB!C-CALL" "SB!GRAY" "SB!FASL" "SB!SYS")
+    :use ("CL" "SB!ALIEN" "SB!GRAY" "SB!FASL" "SB!SYS")
     :export ("*AFTER-SAVE-INITIALIZATIONS*" "*BEFORE-SAVE-INITIALIZATIONS*"
 
-             "*ALL-MODIFIER-NAMES*"
-             "*BACKUP-EXTENSION*"
-
             ;; lambda list keyword extensions
             "&MORE"
 
@@ -661,16 +672,6 @@ retained, possibly temporariliy, because it might be used internally."
              ;; hash mixing operations
              "MIX" "MIXF"
              
-             ;; optimization idioms
-             "*OPTIMIZE-BYTE-COMPILATION*"
-             "*OPTIMIZE-EXTERNAL-DESPITE-BYTE-COMPILATION*"
-
-             ;; Arguably there's no one right value for the system
-             ;; prompt. But Common Lisp makes it easy for you to write
-             ;; your own REPL if you really care, so I'm not convinced we
-             ;; need this as a supported extension.
-             "*PROMPT*"
-
              ;; I'm not convinced that FDEFINITIONs are the ideal
              ;; solution, so exposing ways to peek into the system
              ;; seems undesirable, since it makes it harder to get
@@ -688,6 +689,9 @@ retained, possibly temporariliy, because it might be used internally."
              ;; in the cross-compiler's environment
              "DEF!MACRO" "DEF!METHOD" "DEF!STRUCT" "DEF!TYPE"
 
+            ;; stuff for hinting to the compiler
+            "NAMED-LAMBDA"
+            
              ;; other variations on DEFFOO stuff useful for bootstrapping
              ;; and cross-compiling
              "DEFMACRO-MUNDANELY"
@@ -713,24 +717,30 @@ retained, possibly temporariliy, because it might be used internally."
              "ASSQ" "DELQ" "MEMQ" "POSQ" "NEQ"
              "%FIND-PACKAGE-OR-LOSE" "FIND-UNDELETED-PACKAGE-OR-LOSE"
              "SANE-PACKAGE" 
-             "CIRCULAR-LIST-P"
+             "CYCLIC-LIST-P"
+            "COMPOUND-OBJECT-P"
              "SWAPPED-ARGS-FUN"
              "ANY/TYPE" "EVERY/TYPE"
              "TYPE-BOUND-NUMBER"
              "CONSTANTLY-T" "CONSTANTLY-NIL" "CONSTANTLY-0"
              "PSXHASH"
              "%BREAK"
+            "NTH-BUT-WITH-SANE-ARG-ORDER"
+            "DEPRECATION-WARNING"
 
              ;; ..and macros..
              "COLLECT"
              "DO-ANONYMOUS" "DOHASH" "DOVECTOR"
-            "NAMED-LAMBDA"
              "NAMED-LET"
              "ONCE-ONLY"
              "DEFENUM"
              "DEFPRINTER"
-             "AVER" "AVER-TYPE" "ENFORCE-TYPE"
+             "AVER" "ENFORCE-TYPE"
 
+            ;; ..and CONDITIONs..
+            "BUG"
+            "UNSUPPORTED-OPERATOR"
+            
              ;; ..and DEFTYPEs..
              "INDEX" 
 
@@ -746,9 +756,9 @@ retained, possibly temporariliy, because it might be used internally."
              "RATIOP" 
 
              ;; encapsulation
-             "ARGUMENT-LIST"
+             "ARG-LIST"
              "BASIC-DEFINITION"
-             "ENCAPSULATE" "ENCAPSULATED-DEFINITION" "ENCAPSULATED-P"
+             "ENCAPSULATE" "ENCAPSULATED-P"
              "UNENCAPSULATE"
 
              ;; various CHAR-CODEs
@@ -760,10 +770,9 @@ retained, possibly temporariliy, because it might be used internally."
 
              ;; certainly doesn't belong in public extensions
              ;; FIXME: maybe belongs in %KERNEL with other typesystem stuff?
-             "CONSTANT-ARGUMENT"
+             "CONSTANT-ARG"
 
              ;; various internal defaults
-             "*DEFAULT-PACKAGE-USE-LIST*"
              "DEFAULT-INIT-CHAR" "*DEFAULT-INIT-CHAR-FORM*"
              "*LOAD-SOURCE-DEFAULT-TYPE*"
 
@@ -774,7 +783,6 @@ retained, possibly temporariliy, because it might be used internally."
              ;; time
              "FORMAT-DECODED-TIME"
              "FORMAT-UNIVERSAL-TIME"
-             "PARSE-TIME"
 
              ;; indenting
              "MAKE-INDENTING-STREAM"
@@ -810,8 +818,9 @@ 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"
@@ -820,12 +829,13 @@ retained, possibly temporariliy, because it might be used internally."
              "LIST-WITH-LENGTH-P"
              "READ-SEQUENCE-OR-DIE"
              "RENAME-KEY-ARGS"
-             "REQUIRED-ARGUMENT"
+             "MISSING-ARG"
              "UNIX-NAMESTRING" ; FIXME: perhaps belongs in package SB!UNIX
              "FEATUREP"
              "FLUSH-STANDARD-OUTPUT-STREAMS"
              "MAKE-GENSYM-LIST"
-             "ABOUT-TO-MODIFY"
+             "ABOUT-TO-MODIFY-SYMBOL-VALUE"
+            "SYMBOL-SELF-EVALUATING-P"
              "PRINT-PRETTY-ON-STREAM-P"
              "LOOKS-LIKE-NAME-OF-SPECIAL-VAR-P"
              "POSITIVE-PRIMEP" 
@@ -855,7 +865,7 @@ retained, possibly temporariliy, because it might be used internally."
              "FAST-READ-CHAR-REFILL"
              "FAST-READ-S-INTEGER"
              "FAST-READ-U-INTEGER"
-             "FAST-READ-VARIABLE-U-INTEGER"
+             "FAST-READ-VAR-U-INTEGER"
              "FILE-NAME"
              "INTERN*"
              "PREPARE-FOR-FAST-READ-BYTE"
@@ -867,23 +877,27 @@ retained, possibly temporariliy, because it might be used internally."
             "COLD-FSET"
              "!DEFUN-FROM-COLLECTED-COLD-INIT-FORMS"))
 
- #s(sb-cold:package-data
-    :name "SB!ITERATE"
-    :doc "private: an iteration facility used to implement PCL"
-    :use ("CL" "SB!WALKER" "SB!INT" "SB!EXT")
-    :export ("ITERATE" "ITERATE*" "GATHERING" "GATHER"
-             "WITH-GATHERING" "INTERVAL" "ELEMENTS"
-             "LIST-ELEMENTS" "LIST-TAILS" "PLIST-ELEMENTS"
-             "EACHTIME" "WHILE" "UNTIL" "COLLECTING" "JOINING"
-             "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.)
+ ;; doesn't actually use the type system stuff.) And maybe other
+ ;; possible splits too:
+ ;;   * Pull GC stuff (*GC-INHIBIT*, *NEED-TO-COLLECT-GARBAGE*, etc.)
+ ;;     out into SB-GC.
+ ;;   * Pull special case implementations of sequence functions (e.g.
+ ;;     %MAP-TO-LIST-ARITY-1 and %FIND-POSITION-IF-NOT) and 
+ ;;     other sequence function implementation grot into SB-SEQ.
+ ;;   * Pull all the math stuff (%ACOS, %COSH, 32BIT-LOGICAL-AND...)
+ ;;     into SB-MATH.
+ ;;   * Pull all the array stuff (%ARRAY-DATA-VECTOR, %RAW-REF-LONG,
+ ;;     WITH-ARRAY-DATA, ALLOCATE-VECTOR, HAIRY-DATA-VECTOR-REF...)
+ ;;     into SB-ARRAY.
+ ;;   * Pull all the streams stuff out into SB-STREAM.
+ ;;   * Pull all the OBJECT-NOT-FOO symbols out. Maybe we could even
+ ;;     figure out a way to stop exporting them? Failing that,
+ ;;     they could be in SB-INTERR.
  #s(sb-cold:package-data
     :name "SB!KERNEL"
     :doc
@@ -892,8 +906,7 @@ integration' (said CMU CL architecture.tex) and that probably was and
 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"))
-    :reexport ("DEF!STRUCT" "DEF!MACRO" "VOID" "WEAK-POINTER-P")
+    :reexport ("DEF!STRUCT" "DEF!MACRO")
     :export ("%ACOS" "%ACOSH" "%ARRAY-AVAILABLE-ELEMENTS"
              "%ARRAY-DATA-VECTOR" "%ARRAY-DIMENSION"
              "%ARRAY-DISPLACED-P"
@@ -901,13 +914,15 @@ is a good idea, but see SB-SYS re. 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"
+             "%FIND-POSITION-IF-NOT" "%FIND-POSITION-IF-NOT-VECTOR-MACRO"
+             "%FUN-DOC" "%FUN-NAME"
+             "%HYPOT" "%LDB"
              "%LOG" "%LOGB" "%LOG10" "%LOG1P" "%LONG-FLOAT"
              "%MAKE-COMPLEX" "%MAKE-FUNCALLABLE-INSTANCE" "%MAKE-RATIO"
              "%MAP" "%MAP-TO-SIMPLE-VECTOR-ARITY-1" "%MAP-TO-LIST-ARITY-1"
@@ -920,7 +935,7 @@ is a good idea, but see SB-SYS re. 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"
@@ -928,19 +943,18 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "%SET-SIGNED-SAP-REF-16" "%SET-SIGNED-SAP-REF-32"
              "%SET-SIGNED-SAP-REF-64" "%SET-SIGNED-SAP-REF-8"
              "%SET-STACK-REF" "%SIN" "%SIN-QUICK"
-             "%SINGLE-FLOAT" "%SINH" "%SP-SET-DEFINITION"
-             "%SP-SET-PLIST"
+             "%SINGLE-FLOAT" "%SINH" 
              "%SQRT" "%SXHASH-SIMPLE-STRING"
              "%SXHASH-SIMPLE-SUBSTRING" "%TAN" "%TAN-QUICK"
              "%TANH" "%UNARY-ROUND" "%UNARY-TRUNCATE"
              "%WITH-ARRAY-DATA" "%WITH-ARRAY-DATA-MACRO" 
              "*ALREADY-MAYBE-GCING*"
-             "*CURRENT-LEVEL*" "*EMPTY-TYPE*"
-             "*EVAL-STACK*" "*EVAL-STACK-TOP*" "*GC-INHIBIT*"
+             "*CURRENT-LEVEL-IN-PRINT*" "*EMPTY-TYPE*"
+             "*GC-INHIBIT*"
              "*NEED-TO-COLLECT-GARBAGE*"
              "*PRETTY-PRINTER*" "*UNIVERSAL-TYPE*"
-             "*UNIVERSAL-FUNCTION-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"
@@ -968,7 +982,7 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "BIT-BASH-NOT"
              "BIT-BASH-ORC1" "BIT-BASH-ORC2" "BIT-BASH-SET"
              "BIT-BASH-XOR"
-             "BIT-INDEX" "BOGUS-ARGUMENT-TO-VALUES-LIST-ERROR"
+             "BIT-INDEX" "BOGUS-ARG-TO-VALUES-LIST-ERROR"
              "BOOLE-CODE"
              "BYTE-SPECIFIER"
              "%BYTE-BLT"
@@ -979,7 +993,7 @@ is a good idea, but see SB-SYS re. 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-LEXENV"
+             "COERCE-TO-BIT-VECTOR" "COERCE-TO-FUN" "COERCE-TO-LEXENV"
              "COERCE-TO-LIST" "COERCE-TO-SIMPLE-STRING"
              "COERCE-TO-SIMPLE-VECTOR" "COERCE-TO-VECTOR"
              "*COLD-INIT-COMPLETE-P*"
@@ -1000,6 +1014,7 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "DATA-VECTOR-REF" "DATA-VECTOR-SET" "DECODE-DOUBLE-FLOAT"
              "DECODE-LONG-FLOAT" "DECODE-SINGLE-FLOAT"
              "DEFINED-FTYPE-MATCHES-DECLARED-FTYPE-P"
+            "!DEFSTRUCT-WITH-ALTERNATE-METACLASS"
              "DESCEND-INTO"
              "DIVISION-BY-ZERO-ERROR"
              "DOUBLE-FLOAT-EXPONENT" "DOUBLE-FLOAT-HIGH-BITS"
@@ -1015,18 +1030,17 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "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" 
+             "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"
+             "GET-LISP-OBJ-ADDRESS" "LOWTAG-OF"
+             "WIDETAG-OF"
              "HAIRY-DATA-VECTOR-REF" "HAIRY-DATA-VECTOR-SET" "HAIRY-TYPE"
              "HAIRY-TYPE-CHECK-TEMPLATE-NAME" "HAIRY-TYPE-SPECIFIER"
              "HANDLE-CIRCULARITY" "IGNORE-IT"
@@ -1041,7 +1055,7 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "INTERNAL-ERROR" "INTERNAL-TIME"
              "INTERSECTION-TYPE" "INTERSECTION-TYPE-P"
              "INTERSECTION-TYPE-TYPES"
-             "INVALID-ARGUMENT-COUNT-ERROR" "INVALID-ARRAY-INDEX-ERROR"
+             "INVALID-ARG-COUNT-ERROR" "INVALID-ARRAY-INDEX-ERROR"
              "INVALID-UNWIND-ERROR" "IRRATIONAL"
              "JUST-DUMP-IT-NORMALLY"
              "KEY-INFO" "KEY-INFO-NAME"
@@ -1049,12 +1063,12 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "LAYOUT-DEPTHOID"
              "LAYOUT-INVALID-ERROR" "LEXENV"
              "LINE-LENGTH"
-             "LISP-STREAM"
-             "LISP-STREAM-BIN" "LISP-STREAM-BOUT"
-             "LISP-STREAM-IN" "LISP-STREAM-IN-BUFFER"
-             "LISP-STREAM-IN-INDEX"
-             "LISP-STREAM-MISC" "LISP-STREAM-N-BIN"
-             "LISP-STREAM-OUT" "LISP-STREAM-SOUT"
+             "ANSI-STREAM"
+             "ANSI-STREAM-BIN" "ANSI-STREAM-BOUT"
+             "ANSI-STREAM-IN" "ANSI-STREAM-IN-BUFFER"
+             "ANSI-STREAM-IN-INDEX"
+             "ANSI-STREAM-MISC" "ANSI-STREAM-N-BIN"
+             "ANSI-STREAM-OUT" "ANSI-STREAM-SOUT"
              "LIST-TO-SIMPLE-STRING*" "LIST-TO-BIT-VECTOR*"
              "LIST-TO-VECTOR*" 
              "LONG-FLOAT-EXPONENT" "LONG-FLOAT-EXP-BITS"
@@ -1064,7 +1078,7 @@ is a good idea, but see SB-SYS re. 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"
@@ -1077,7 +1091,7 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "MUTATOR-SELF"
              "NAMED-TYPE" "NAMED-TYPE-NAME" "NAMED-TYPE-P"
              "NATIVE-BYTE-ORDER" "NEGATE"
-             "NEVER-SUBTYPEP" "NIL-FUNCTION-RETURNED-ERROR"
+             "NEVER-SUBTYPEP" "NIL-FUN-RETURNED-ERROR"
              "NOT-<=-ERROR" "NOT-=-ERROR"
              "NOT-DUMPED-AT-ALL"
              "NUMERIC-CONTAGION" "NUMERIC-TYPE"
@@ -1086,7 +1100,7 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "NUMERIC-TYPE-HIGH" "NUMERIC-TYPE-LOW" "NUMERIC-TYPE-P"
              "OBJECT-NOT-ARRAY-ERROR" "OBJECT-NOT-BASE-CHAR-ERROR"
              "OBJECT-NOT-BIGNUM-ERROR" "OBJECT-NOT-BIT-VECTOR-ERROR"
-             "OBJECT-NOT-COERCEABLE-TO-FUNCTION-ERROR"
+             "OBJECT-NOT-COERCEABLE-TO-FUN-ERROR"
              "OBJECT-NOT-COMPLEX-ERROR"
              "OBJECT-NOT-COMPLEX-FLOAT-ERROR"
              "OBJECT-NOT-COMPLEX-SINGLE-FLOAT-ERROR"
@@ -1100,8 +1114,7 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "OBJECT-NOT-COMPLEX-VECTOR-ERROR"
              "OBJECT-NOT-CONS-ERROR"
              "OBJECT-NOT-DOUBLE-FLOAT-ERROR" "OBJECT-NOT-FIXNUM-ERROR"
-             "OBJECT-NOT-FLOAT-ERROR" "OBJECT-NOT-FUNCTION-ERROR"
-             "OBJECT-NOT-FUNCTION-OR-SYMBOL-ERROR"
+             "OBJECT-NOT-FLOAT-ERROR" "OBJECT-NOT-FUN-ERROR"
              "OBJECT-NOT-INSTANCE-ERROR"
              "OBJECT-NOT-INTEGER-ERROR"
              "OBJECT-NOT-LIST-ERROR" "OBJECT-NOT-LONG-FLOAT-ERROR"
@@ -1133,7 +1146,7 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "OBJECT-NOT-TYPE-ERROR"
              "OBJECT-NOT-UNSIGNED-BYTE-32-ERROR"
              "OBJECT-NOT-VECTOR-ERROR" "OBJECT-NOT-WEAK-POINTER-ERROR"
-             "ODD-KEY-ARGUMENTS-ERROR"
+             "ODD-KEY-ARGS-ERROR"
              "OUTPUT-OBJECT" "OUTPUT-UGLY-OBJECT"
              "PACKAGE-DOC-STRING"
              "PACKAGE-HASHTABLE-SIZE" "PACKAGE-HASHTABLE-FREE"
@@ -1192,7 +1205,7 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "UNBOUND-SYMBOL-ERROR" "UNBOXED-ARRAY"
              "UNDEFINED-SYMBOL-ERROR" "UNION-TYPE" "UNION-TYPE-P"
              "UNION-TYPE-TYPES" "UNKNOWN-ERROR"
-             "UNKNOWN-KEY-ARGUMENT-ERROR"
+             "UNKNOWN-KEY-ARG-ERROR"
              "UNKNOWN-TYPE" "UNKNOWN-TYPE-P"
              "UNKNOWN-TYPE-SPECIFIER" "UNSEEN-THROW-TAG-ERROR"
              "UNSIGNED-BYTE-32-P"
@@ -1209,25 +1222,24 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "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-MAKUNBOUND" "%COERCE-NAME-TO-FUNCTION"
-             "%COERCE-CALLABLE-TO-FUNCTION"
-             "FUNCTION-SUBTYPE" "*MAXIMUM-ERROR-DEPTH*"
+             "FDEFN-NAME" "FDEFN-FUN"
+             "FDEFN-MAKUNBOUND" "OUTER-FDEFN"
+             "%COERCE-CALLABLE-TO-FUN"
+             "FUN-SUBTYPE" "*MAXIMUM-ERROR-DEPTH*"
              "%SET-SYMBOL-PLIST" "INFINITE-ERROR-PROTECT"
              "FIND-CALLER-NAME-AND-FRAME"
              "%SET-SYMBOL-VALUE" "%SET-SYMBOL-PACKAGE"
              "OUTPUT-SYMBOL-NAME"
-             "FSET" "RAW-DEFINITION"
+             "%COERCE-NAME-TO-FUN"
              "INVOKE-MACROEXPAND-HOOK"
              "DEFAULT-STRUCTURE-PRINT"
              "LAYOUT" "LAYOUT-LENGTH"
              "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"
@@ -1238,33 +1250,33 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "%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-NAME"
+             "%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"
+             "%SIMPLE-FUN-TYPE" "PROCLAIM-AS-FUN-NAME"
+             "BECOME-DEFINED-FUN-NAME"
              "%NUMERATOR" "CLASS-TYPEP"
-             "STRUCTURE-CLASS-PRINT-FUNCTION" "DSD-READ-ONLY"
+             "DSD-READ-ONLY"
              "LAYOUT-INHERITS" "DD-LENGTH" "%CODE-ENTRY-POINTS"
              "%DENOMINATOR"
              "MAKE-STANDARD-CLASS"
              "CLASS-CELL-TYPEP" 
-             "FIND-CLASS-CELL" "EXTRACT-FUNCTION-TYPE"
+             "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"
+             "RANDOM-PCL-CLASS" 
              "%FUNCALLABLE-INSTANCE-INFO" "RANDOM-CHUNK"
              "MAKE-FUNCALLABLE-STRUCTURE-CLASS" "LAYOUT-CLOS-HASH-MAX"
              "CLASS-CELL-NAME" "BUILT-IN-CLASS-DIRECT-SUPERCLASSES"
              "RANDOM-LAYOUT-CLOS-HASH"
              "CLASS-PCL-CLASS" "FUNCALLABLE-STRUCTURE"
-             "FUNCALLABLE-INSTANCE-FUNCTION"
+             "FUNCALLABLE-INSTANCE-FUN"
              "%FUNCALLABLE-INSTANCE-LAYOUT"
              "BASIC-STRUCTURE-CLASS" 
              "CLASS-CELL-CLASS"
@@ -1272,7 +1284,7 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "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"
              "REDEFINE-LAYOUT-WARNING" "SLOT-CLASS"
@@ -1291,7 +1303,7 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "!ALIEN-TYPE-COLD-INIT" "!CLASSES-COLD-INIT"
              "!EARLY-TYPE-COLD-INIT" "!LATE-TYPE-COLD-INIT"
              "!TARGET-TYPE-COLD-INIT" "!RANDOM-COLD-INIT"
-             "!READER-COLD-INIT"
+             "!READER-COLD-INIT" "!TYPECHECKFUNS-COLD-INIT"
              "STREAM-COLD-INIT-OR-RESET" "!LOADER-COLD-INIT"
              "!PACKAGE-COLD-INIT" "SIGNAL-COLD-INIT-OR-REINIT"
              "!POLICY-COLD-INIT-OR-RESANIFY" "!VM-TYPE-COLD-INIT"
@@ -1359,8 +1371,8 @@ definitely not guaranteed to be present in later versions of SBCL."
     ;; this until the duplicate SB-PCL:CLASS/CL:CLASS hierarchy kludge
     ;; is unscrewed, since until it is there are too many things which
     ;; conflict between the two packages.
-    :use ("CL" "SB!ITERATE" "SB!WALKER" "SB!INT" "SB!EXT")
-    :import-from (("SB!KERNEL" "FUNCALLABLE-INSTANCE-P" "FUNCTION-DOC"
+    :use ("CL" "SB!INT" "SB!EXT" "SB!WALKER")
+    :import-from (("SB!KERNEL" "FUNCALLABLE-INSTANCE-P" "%FUN-DOC"
                    "PACKAGE-DOC-STRING"
                    "PACKAGE-HASHTABLE-SIZE" "PACKAGE-HASHTABLE-FREE"
                    "PACKAGE-INTERNAL-SYMBOLS" "PACKAGE-EXTERNAL-SYMBOLS"))
@@ -1417,7 +1429,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"
@@ -1479,7 +1491,7 @@ SB-KERNEL) have been undone, but probably more remain."
              "DEALLOCATE-SYSTEM-MEMORY"
              "DEFAULT-INTERRUPT"
              "DEPORT-BOOLEAN" "DEPORT-INTEGER"
-             "DO-DO-BODY" "DOUBLE-FLOAT-RADIX"
+             "FROB-DO-BODY" "DOUBLE-FLOAT-RADIX"
              "ENABLE-INTERRUPT" "ENUMERATION"
              "FD-STREAM" "FD-STREAM-FD"
              "FD-STREAM-P" 
@@ -1531,8 +1543,12 @@ stable Unix interface suitable for the end user.
 This package only tries to implement what happens to be
 needed by the current implementation of SBCL, and makes
 no guarantees of interface stability."
-    :use ("CL" "SB!ALIEN" "SB!C-CALL" "SB!EXT" "SB!INT" "SB!SYS")
-    :export ("D-INO" "D-NAME" "D-NAMLEN" "D-OFF" "D-RECLEN"
+    :use ("CL" "SB!ALIEN" "SB!EXT" "SB!INT" "SB!SYS")
+    :export (;; wrappers around Unix stuff to give just what Lisp needs
+            "UID-USERNAME"
+
+            ;; stuff with a one-to-one mapping to Unix constructs
+            "D-INO" "D-NAME" "D-NAMLEN" "D-OFF" "D-RECLEN"
              "DEV-T" "DIRECT" "EXECGRP" "EXECOTH" "EXECOWN" "F-DUPFD"
              "F-GETFD" "F-GETFL" "F-GETOWN" "F-SETFD" "F-SETFL" "F-SETOWN"
              "FAPPEND" "FASYNC" "FCREAT" "FEXCL" "FIONREAD" "FNDELAY" "FTRUNC"
@@ -1660,45 +1676,46 @@ no guarantees of interface stability."
 "internal: the default place to hide information about the hardware and data
 structure representations"
     :use ("CL" "SB!ALIEN" "SB!ALIEN-INTERNALS" "SB!ASSEM" "SB!C"
-          "SB!C-CALL" "SB!EXT" "SB!FASL" "SB!INT" "SB!KERNEL"
-          "SB!SYS" "SB!UNIX")
+          "SB!EXT" "SB!FASL" "SB!INT" "SB!KERNEL" "SB!SYS" "SB!UNIX")
     :export ("*ASSEMBLY-UNIT-LENGTH*" "*PRIMITIVE-OBJECTS*"
              "AFTER-BREAKPOINT-TRAP"
              "ANY-REG-SC-NUMBER" "ARRAY-DATA-SLOT" "ARRAY-DIMENSIONS-OFFSET"
              "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-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"
              "CONTROL-STACK-SC-NUMBER" "COUNT-NO-OPS"
+            "*CURRENT-CATCH-BLOCK*"
              "CURRENT-DYNAMIC-SPACE-START"
              "CURRENT-FLOAT-TRAP" "DEFINE-FOR-EACH-PRIMITIVE-OBJECT"
              "DESCRIPTOR-REG-SC-NUMBER" "DESCRIPTOR-VS-NON-DESCRIPTOR-STORAGE"
@@ -1708,13 +1725,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"
@@ -1723,85 +1740,99 @@ 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"
+             "INTERIOR-REG-SC-NUMBER" "INTERNAL-ERROR-ARGS"
+             "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"
-             "RETURN-PC-RETURN-POINT-OFFSET" "SANCTIFY-FOR-EXECUTION"
+             "REGISTER-SAVE-PENALTY" "RETURN-PC-HEADER-WIDETAG"
+             "RETURN-PC-RETURN-POINT-OFFSET" "RETURN-PC-SAVE-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"
              "SINGLE-VALUE-RETURN-BYTE-OFFSET" "SLOT-DOCS"
              "SLOT-LENGTH" "SLOT-NAME" "SLOT-OFFSET" "SLOT-OPTIONS"
-             "SLOT-REST-P" "*STATIC-FUNCTIONS*" "STATIC-FUNCTION-OFFSET"
+             "SLOT-REST-P" "*STATIC-FUNS*" "STATIC-FUN-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"
@@ -1816,19 +1847,22 @@ structure representations"
              "*TARGET-MOST-POSITIVE-FIXNUM*" 
              "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-FUN-EPILOGUE" "TRACE-TABLE-FUN-PROLOGUE"
+             "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
@@ -1837,9 +1871,9 @@ structure representations"
     :use ("CL" "SB!INT" "SB!EXT")
     :export ("DEFINE-WALKER-TEMPLATE" "WALK-FORM"
              "*WALK-FORM-EXPAND-MACROS-P*" 
-             "VARIABLE-LEXICAL-P" "VARIABLE-SPECIAL-P"
-             "VARIABLE-GLOBALLY-SPECIAL-P"
-             "*VARIABLE-DECLARATIONS*" "VARIABLE-DECLARATION"
+             "VAR-LEXICAL-P" "VAR-SPECIAL-P"
+             "VAR-GLOBALLY-SPECIAL-P"
+             "*VAR-DECLARATIONS*" "VAR-DECLARATION"
 
              ;; These were exported from the original PCL version of this 
              ;; package, but aren't used in SBCL.