0.6.9.16:

[sbcl.git] / package-data-list.lisp-expr

diff --git a/package-data-list.lisp-expr b/package-data-list.lisp-expr
index b148a64..7888052 100644 (file)
--- a/package-data-list.lisp-expr
+++ b/package-data-list.lisp-expr
@@ -35,6 +35,7 @@
     :doc "private: stuff for implementing ALIENs and friends"
     :use ("CL")
     :export ("%CAST" "%DEREF-ADDR" "%HEAP-ALIEN" "%HEAP-ALIEN-ADDR"
     :doc "private: stuff for implementing ALIENs and friends"
     :use ("CL")
     :export ("%CAST" "%DEREF-ADDR" "%HEAP-ALIEN" "%HEAP-ALIEN-ADDR"

+

              "%LOCAL-ALIEN-ADDR" "%LOCAL-ALIEN-FORCED-TO-MEMORY-P" "%SAP-ALIEN"
              "%SET-DEREF" "%SET-HEAP-ALIEN" "%SET-LOCAL-ALIEN" "%SET-SLOT"
              "%SLOT-ADDR" "*VALUES-TYPE-OKAY*" "ALIEN-ARRAY-TYPE"
              "%LOCAL-ALIEN-ADDR" "%LOCAL-ALIEN-FORCED-TO-MEMORY-P" "%SAP-ALIEN"
              "%SET-DEREF" "%SET-HEAP-ALIEN" "%SET-LOCAL-ALIEN" "%SET-SLOT"
              "%SLOT-ADDR" "*VALUES-TYPE-OKAY*" "ALIEN-ARRAY-TYPE"

@@ -77,7 +78,7 @@
  #s(sb-cold:package-data
     :name "SB!ASSEM"
     :doc "private: the assembler, used by the compiler"
  #s(sb-cold:package-data
     :name "SB!ASSEM"
     :doc "private: the assembler, used by the compiler"

-    :use ("CL")
+    :use ("CL" "SB!INT" "SB!EXT")

     :export ("ASSEMBLY-UNIT"
 
              "*ASSEM-SCHEDULER-P*"
     :export ("ASSEMBLY-UNIT"
 
              "*ASSEM-SCHEDULER-P*"

@@ -98,11 +99,11 @@
              "VARIABLE-LENGTH"
              "SEGMENT-COLLECT-DYNAMIC-STATISTICS"
 
              "VARIABLE-LENGTH"
              "SEGMENT-COLLECT-DYNAMIC-STATISTICS"
 

-             ;; In classic CMU CL, these symbols were explicitly imported by
-             ;; package C. Since package C uses package ASSEM (and no
-             ;; other package does) it seems cleaner to export these symbols
-             ;; from package ASSEM instead. I hope nothing breaks..
-             ;;   -- WHN 19990220
+            ;; FIXME: These are in the SB-ASSEM package now, but
+             ;; (left over from CMU CL) are defined in files which
+             ;; are IN-PACKAGE SB-C. It would probably be cleaner
+             ;; to move at least most of them to files which are
+             ;; IN-PACKAGE SB-ASSEM.

              "BRANCH" "DO-SSET-ELEMENTS" "FLUSHABLE" "MAKE-SSET" "SSET"
              "SSET-ADJOIN" "SSET-DELETE" "SSET-ELEMENT" "SSET-EMPTY"))
 
              "BRANCH" "DO-SSET-ELEMENTS" "FLUSHABLE" "MAKE-SSET" "SSET"
              "SSET-ADJOIN" "SSET-DELETE" "SSET-ELEMENT" "SSET-EMPTY"))
 

@@ -155,8 +156,7 @@
               "*BACKEND-T-PRIMITIVE-TYPE*"
 
               "*CODE-SEGMENT*" 
               "*BACKEND-T-PRIMITIVE-TYPE*"
 
               "*CODE-SEGMENT*" 

-              "*COMPILE-TIME-DEFINE-MACROS*"
-              "*COMPILING-FOR-INTERPRETER*" "*CONVERTING-FOR-INTERPRETER*"
+              "*CONVERTING-FOR-INTERPRETER*"

               "*COUNT-VOP-USAGES*" "*ELSEWHERE*"
               "*FASL-HEADER-STRING-START-STRING*"
               "*FASL-HEADER-STRING-STOP-CHAR-CODE*"
               "*COUNT-VOP-USAGES*" "*ELSEWHERE*"
               "*FASL-HEADER-STRING-START-STRING*"
               "*FASL-HEADER-STRING-STOP-CHAR-CODE*"

@@ -185,7 +185,7 @@
               "DEALLOC-NUMBER-STACK-SPACE" "DEF-BOOLEAN-ATTRIBUTE"
               "DEF-IR1-TRANSLATOR" "DEF-PRIMITIVE-TRANSLATOR"
               "DEF-PRIMITIVE-TYPE" "DEF-PRIMITIVE-TYPE-ALIAS"
               "DEALLOC-NUMBER-STACK-SPACE" "DEF-BOOLEAN-ATTRIBUTE"
               "DEF-IR1-TRANSLATOR" "DEF-PRIMITIVE-TRANSLATOR"
               "DEF-PRIMITIVE-TYPE" "DEF-PRIMITIVE-TYPE-ALIAS"

-              "DEF-SOURCE-TRANSFORM" "DEF-VM-SUPPORT-ROUTINE"
+              "DEF-SOURCE-TRANSFORM" "!DEF-VM-SUPPORT-ROUTINE"

               "DEFINE-ASSEMBLY-ROUTINE" "DEFINE-MOVE-FUNCTION"
               "DEFINE-MOVE-VOP" "DEFINE-STORAGE-BASE"
               "DEFINE-STORAGE-CLASS" "DEFINE-VOP"
               "DEFINE-ASSEMBLY-ROUTINE" "DEFINE-MOVE-FUNCTION"
               "DEFINE-MOVE-VOP" "DEFINE-STORAGE-BASE"
               "DEFINE-STORAGE-CLASS" "DEFINE-VOP"

@@ -207,7 +207,8 @@
               "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-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" "META-PRIMITIVE-TYPE-OR-LOSE"
+              "MAKE-VALUE-CELL" "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"
               "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"

@@ -256,7 +257,6 @@
               "BLOCK-NUMBER"
               "BACKEND"
               "BACKEND-BYTE-FASL-FILE-IMPLEMENTATION"
               "BLOCK-NUMBER"
               "BACKEND"
               "BACKEND-BYTE-FASL-FILE-IMPLEMENTATION"

-              "BACKEND-BYTE-FASL-FILE-TYPE"

               "IR2-BLOCK-BLOCK"
               "DISASSEM-BYTE-COMPONENT"
               "FUNCALLABLE-INSTANCE-LEXENV"
               "IR2-BLOCK-BLOCK"
               "DISASSEM-BYTE-COMPONENT"
               "FUNCALLABLE-INSTANCE-LEXENV"

@@ -325,14 +325,15 @@
  #s(sb-cold:package-data
     :name "SB!IMPL"
     :doc "private: a grab bag of implementation details"
  #s(sb-cold:package-data
     :name "SB!IMPL"
     :doc "private: a grab bag of implementation details"

-    :use ("CL" "SB!EXT" "SB!INT" "SB!SYS" "SB!DEBUG" "SB!KERNEL" "SB!BIGNUM"))
+    :use ("CL" "SB!EXT" "SB!INT" "SB!SYS" "SB!DEBUG" "SB!KERNEL" "SB!BIGNUM"
+          "SB!GRAY"))

 
  ;; FIXME: It seems to me that this could go away, with its contents moved
  ;; into SB!KERNEL, like the implementation of the rest of the class system.
 
  ;; FIXME: It seems to me that this could go away, with its contents moved
  ;; into SB!KERNEL, like the implementation of the rest of the class system.

- #s(sb-cold:package-data
-    :name "SB!CONDITIONS"
-    :doc "private: the implementation of the condition system"
-    :use ("CL" "SB!EXT" "SB!INT" "SB!KERNEL"))
+;; #s(sb-cold:package-data
+;;    :name "SB!CONDITIONS"
+;;    :doc "private: the implementation of the condition system"
+;;    :use ("CL" "SB!EXT" "SB!INT" "SB!KERNEL"))

 
  #s(sb-cold:package-data
     :name "SB!DEBUG"
 
  #s(sb-cold:package-data
     :name "SB!DEBUG"

@@ -342,9 +343,9 @@ 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-CONDITION*"
 like *STACK-TOP-HINT*"
     :use ("CL" "SB!EXT" "SB!INT" "SB!SYS")
     :export ("*AUTO-EVAL-IN-FRAME*" "*DEBUG-CONDITION*"

-            "*DEBUG-PRINT-LENGTH*" "*DEBUG-PRINT-LEVEL*" "*DEBUG-READTABLE*"
-            "*DEBUG-PROMPT*" "*DEBUG-HELP-STRING*" "*FLUSH-DEBUG-ERRORS*"
-             "*IN-THE-DEBUGGER*"
+            "*DEBUG-PRINT-LENGTH*" "*DEBUG-PRINT-LEVEL*"
+             "*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-INDENTATION-STEP*" "*MAX-TRACE-INDENTATION*"
              "*TRACE-FRAME*" "*TRACE-PRINT-LENGTH*"
              "*TRACE-PRINT-LEVEL*" "*TRACED-FUNCTION-LIST*"

@@ -357,7 +358,7 @@ like *STACK-TOP-HINT*"
  #s(sb-cold:package-data
     :name "SB!DI"
     :doc "private: primitives used to write debuggers"
  #s(sb-cold:package-data
     :name "SB!DI"
     :doc "private: primitives used to write debuggers"

-    :use ("CL" "SB!EXT" "SB!INT" "SB!KERNEL" "SB!SYS")
+    :use ("CL" "SB!EXT" "SB!INT" "SB!KERNEL" "SB!SYS" "SB!VM")

     :import-from (("SB!C"
                    "DEBUG-SOURCE-FROM" "DEBUG-SOURCE-NAME"
                    "DEBUG-SOURCE-CREATED" "DEBUG-SOURCE-COMPILED"
     :import-from (("SB!C"
                    "DEBUG-SOURCE-FROM" "DEBUG-SOURCE-NAME"
                    "DEBUG-SOURCE-CREATED" "DEBUG-SOURCE-COMPILED"

@@ -397,7 +398,7 @@ like *STACK-TOP-HINT*"
              "LAMBDA-LIST-UNAVAILABLE" "MAKE-BREAKPOINT" "NO-DEBUG-BLOCKS"
              "NO-DEBUG-FUNCTION-RETURNS" "NO-DEBUG-INFO" "PREPROCESS-FOR-EVAL"
              "RETURN-FROM-FRAME" "SOURCE-PATH-CONTEXT"
              "LAMBDA-LIST-UNAVAILABLE" "MAKE-BREAKPOINT" "NO-DEBUG-BLOCKS"
              "NO-DEBUG-FUNCTION-RETURNS" "NO-DEBUG-INFO" "PREPROCESS-FOR-EVAL"
              "RETURN-FROM-FRAME" "SOURCE-PATH-CONTEXT"

-             "TOP-FRAME" "UNHANDLED-CONDITION" "UNKNOWN-CODE-LOCATION"
+             "TOP-FRAME" "UNHANDLED-DEBUG-CONDITION" "UNKNOWN-CODE-LOCATION"

              "UNKNOWN-CODE-LOCATION-P" "UNKNOWN-DEBUG-VAR"
              "CODE-LOCATION-KIND" "FLUSH-FRAMES-ABOVE"))
 
              "UNKNOWN-CODE-LOCATION-P" "UNKNOWN-DEBUG-VAR"
              "CODE-LOCATION-KIND" "FLUSH-FRAMES-ABOVE"))
 

@@ -474,7 +475,7 @@ like *STACK-TOP-HINT*"
     :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?
     :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")
+    :use ("CL" "SB!ALIEN" "SB!C-CALL" "SB!INT" "SB!SYS" "SB!GRAY")

     ;; FIXME: If we advertise these as extensions, they should be in the
     ;; SB!EXT package (and perhaps re-exported from the %KERNEL
     ;; package) rather than in some other package and reexported from
     ;; FIXME: If we advertise these as extensions, they should be in the
     ;; SB!EXT package (and perhaps re-exported from the %KERNEL
     ;; package) rather than in some other package and reexported from

@@ -524,9 +525,8 @@ like *STACK-TOP-HINT*"
              ;; now? -- WHN 19991206
 
              ;; extended declarations..
              ;; now? -- WHN 19991206
 
              ;; extended declarations..

-             "CONSTANT-FUNCTION" "END-BLOCK" "FREEZE-TYPE"
-             "INHIBIT-WARNINGS"
-             "MAYBE-INLINE" "OPTIMIZE-INTERFACE" "START-BLOCK"
+             "FREEZE-TYPE" "INHIBIT-WARNINGS"
+             "MAYBE-INLINE" "OPTIMIZE-INTERFACE"

 
              ;; ..and variables to control compiler policy
              "*INLINE-EXPANSION-LIMIT*"
 
              ;; ..and variables to control compiler policy
              "*INLINE-EXPANSION-LIMIT*"

@@ -576,9 +576,19 @@ like *STACK-TOP-HINT*"
              ;; miscellaneous useful supported extensions
              "QUIT"
 
              ;; miscellaneous useful supported extensions
              "QUIT"
 

-             ;; running a Unix program from Lisp, not quite working
-             ;; in sbcl-0.6.6, but maybe soon..
-             "RUN-PROGRAM"))
+             ;; RUN-PROGRAM is not only useful for users, but also
+             ;; useful to implement parts of SBCL itself, so we're
+             ;; going to have to implement it anyway, so we might
+             ;; as well support it. And then once we're committed
+             ;; to implementing RUN-PROGRAM, it's nice to have it
+             ;; return a PROCESS object with operations defined on
+             ;; that object.
+             "RUN-PROGRAM"
+             "PROCESS-ALIVE-P" "PROCESS-CLOSE"
+             "PROCESS-CORE-DUMPED" "PROCESS-ERROR" "PROCESS-EXIT-CODE"
+             "PROCESS-INPUT" "PROCESS-KILL" "PROCESS-OUTPUT" "PROCESS-P"
+             "PROCESS-PID" "PROCESS-PLIST" "PROCESS-PTY" "PROCESS-STATUS"
+             "PROCESS-STATUS-HOOK" "PROCESS-WAIT"))

 
  #s(sb-cold:package-data
     :name "SB!FORMAT"
 
  #s(sb-cold:package-data
     :name "SB!FORMAT"

@@ -621,7 +631,7 @@ Lisp extension proposal by David N. Gray"
 "private: miscellaneous unsupported extensions to the ANSI spec. Most of
 the stuff in here originated in CMU CL's EXTENSIONS package and is
 retained, possibly temporariliy, because it might be used internally."
 "private: miscellaneous unsupported extensions to the ANSI spec. Most 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!SYS")
+    :use ("CL" "SB!ALIEN" "SB!C-CALL" "SB!SYS" "SB!GRAY")

     ;; FIXME: RATIOP should probably not go through this package but be
     ;; called directly from SB!KERNEL, unless it's implemented as
     ;; TYPEP X 'RATIO in which case it doesn't need to be in SB!KERNEL.
     ;; FIXME: RATIOP should probably not go through this package but be
     ;; called directly from SB!KERNEL, unless it's implemented as
     ;; TYPEP X 'RATIO in which case it doesn't need to be in SB!KERNEL.

@@ -663,18 +673,33 @@ retained, possibly temporariliy, because it might be used internally."
              ;; rid of FDEFINITIONs entirely later.
              "*SETF-FDEFINITION-HOOK*"
 
              ;; rid of FDEFINITIONs entirely later.
              "*SETF-FDEFINITION-HOOK*"
 

-             ;; useful but non-standard user-level functions..
+             ;; non-standard but widely useful user-level functions..

              "ASSQ" "DELQ" "MEMQ"
             "%FIND-PACKAGE-OR-LOSE" "FIND-UNDELETED-PACKAGE-OR-LOSE"
              "ASSQ" "DELQ" "MEMQ"
             "%FIND-PACKAGE-OR-LOSE" "FIND-UNDELETED-PACKAGE-OR-LOSE"

+             "SANE-PACKAGE"
+             "CIRCULAR-LIST-P"

 
 

-            ;; ..and macros
+            ;; ..and macros..

              "COLLECT"
              "DO-ANONYMOUS" "DOHASH" "DOVECTOR"
              "ITERATE"
              "LETF" "LETF*"
              "ONCE-ONLY"
              "COLLECT"
              "DO-ANONYMOUS" "DOHASH" "DOVECTOR"
              "ITERATE"
              "LETF" "LETF*"
              "ONCE-ONLY"

+             "DEFENUM"
+             "DEFPRINTER"

              "DEF!MACRO" "DEF!METHOD" "DEF!STRUCT" "DEF!TYPE"
 
              "DEF!MACRO" "DEF!METHOD" "DEF!STRUCT" "DEF!TYPE"
 

+             ;; ..and DEFTYPEs..
+             "INDEX" 
+
+             ;; ..and type predicates
+             "INSTANCEP"
+             "DOUBLE-FLOATP"
+             "LOGICAL-PATHNAME-P"
+             "LONG-FLOATP"
+             "SHORT-FLOATP"
+             "SINGLE-FLOATP"
+

              ;; encapsulation
              "ARGUMENT-LIST"
              "BASIC-DEFINITION"
              ;; encapsulation
              "ARGUMENT-LIST"
              "BASIC-DEFINITION"

@@ -685,14 +710,6 @@ retained, possibly temporariliy, because it might be used internally."
              "BELL-CHAR-CODE" "ESCAPE-CHAR-CODE" "FORM-FEED-CHAR-CODE"
              "RETURN-CHAR-CODE" "RUBOUT-CHAR-CODE" "TAB-CHAR-CODE"
 
              "BELL-CHAR-CODE" "ESCAPE-CHAR-CODE" "FORM-FEED-CHAR-CODE"
              "RETURN-CHAR-CODE" "RUBOUT-CHAR-CODE" "TAB-CHAR-CODE"
 

-             ;; nonstandard type predicates
-             "INSTANCEP"
-             "DOUBLE-FLOATP"
-             "LOGICAL-PATHNAME-P"
-             "LONG-FLOATP"
-             "SHORT-FLOATP"
-             "SINGLE-FLOATP"
-

              ;; symbol-hacking idioms
              "CONCAT-PNAMES" "KEYWORDICATE" "SYMBOLICATE"
 
              ;; symbol-hacking idioms
              "CONCAT-PNAMES" "KEYWORDICATE" "SYMBOLICATE"
 

@@ -706,21 +723,24 @@ retained, possibly temporariliy, because it might be used internally."
              ;; FIXME: maybe belongs in %KERNEL with other typesystem stuff?
              "CONSTANT-ARGUMENT"
 
              ;; FIXME: maybe belongs in %KERNEL with other typesystem stuff?
              "CONSTANT-ARGUMENT"
 

-             ;; not used any more? (and not appropriate in SB!EXT, since
-             ;; SPECIAL things are so obnoxious in Common Lisp)
+             ;; FIXME: Maybe this isn't used any more? And if it is,
+             ;; it probably needs a better name, since SPECIAL things
+             ;; are such a nice source of sneaky bugs.

              "E"
 
              ;; various internal defaults
              "*DEFAULT-PACKAGE-USE-LIST*"
              "DEFAULT-INIT-CHAR"
              "E"
 
              ;; various internal defaults
              "*DEFAULT-PACKAGE-USE-LIST*"
              "DEFAULT-INIT-CHAR"

-             "*LOAD-SOURCE-TYPES*" "*LOAD-OBJECT-TYPES*"
+             "*LOAD-SOURCE-DEFAULT-TYPE*"

 
              ;; hash caches
              "DEFINE-HASH-CACHE"
              "DEFUN-CACHED"
 
              ;; time
 
              ;; hash caches
              "DEFINE-HASH-CACHE"
              "DEFUN-CACHED"
 
              ;; time

-             "FORMAT-DECODED-TIME" "FORMAT-UNIVERSAL-TIME" "PARSE-TIME"
+             "FORMAT-DECODED-TIME"
+             "FORMAT-UNIVERSAL-TIME"
+             "PARSE-TIME"

 
              ;; indenting
              "MAKE-INDENTING-STREAM"
 
              ;; indenting
              "MAKE-INDENTING-STREAM"

@@ -733,14 +753,6 @@ retained, possibly temporariliy, because it might be used internally."
              ;; used for FORMAT tilde paren
              "MAKE-CASE-FROB-STREAM"
 
              ;; used for FORMAT tilde paren
              "MAKE-CASE-FROB-STREAM"
 

-             ;; Some of these are probably still used for Unix-y processes.
-             ;; -- WHN 19991206
-             "PROCESS-CLOSE"
-             "PROCESS-CORE-DUMPED" "PROCESS-ERROR" "PROCESS-EXIT-CODE"
-             "PROCESS-INPUT" "PROCESS-KILL" "PROCESS-OUTPUT" "PROCESS-P"
-             "PROCESS-PID" "PROCESS-PLIST" "PROCESS-PTY" "PROCESS-STATUS"
-             "PROCESS-STATUS-HOOK" "PROCESS-WAIT"
-

              ;; debuggers' little helpers
              #!+sb-show "*/SHOW*"
              "/SHOW"  "/NOSHOW"
              ;; debuggers' little helpers
              #!+sb-show "*/SHOW*"
              "/SHOW"  "/NOSHOW"

@@ -751,6 +763,10 @@ retained, possibly temporariliy, because it might be used internally."
              ;; placeholders in a target system
              "UNCROSS" 
 
              ;; placeholders in a target system
              "UNCROSS" 
 

+             ;; might as well be shared among the various files which
+             ;; need it:
+             "*EOF-OBJECT*"
+

              ;; misc. utilities used internally
              "LEGAL-FUNCTION-NAME-P"
              "FUNCTION-NAME-BLOCK-NAME"
              ;; misc. utilities used internally
              "LEGAL-FUNCTION-NAME-P"
              "FUNCTION-NAME-BLOCK-NAME"

@@ -764,14 +780,16 @@ retained, possibly temporariliy, because it might be used internally."
              "REQUIRED-ARGUMENT"
              "UNIX-NAMESTRING" ; FIXME: perhaps belongs in package %UNIX
              "FEATUREP"
              "REQUIRED-ARGUMENT"
              "UNIX-NAMESTRING" ; FIXME: perhaps belongs in package %UNIX
              "FEATUREP"

-             "FLUSH-STANDARD-OUTPUT"
-
-             ;; These could be moved back into SB!EXT if someone has compelling
-             ;; reasons, but hopefully we can get by without supporting them,
-             ;; at least not as publicly accessible things with fixed
-             ;; interfaces.
+             "FLUSH-STANDARD-OUTPUT-STREAMS"
+             "MAKE-GENSYM-LIST"
+             "DEFCONSTANT-EQX"
+             "ABOUT-TO-MODIFY"
+
+             ;; These could be moved back into SB!EXT if someone has
+             ;; compelling reasons, but hopefully we can get by
+             ;; without supporting them, at least not as publicly
+             ;; accessible things with fixed interfaces.

              "DEFAULT-DIRECTORY"
              "DEFAULT-DIRECTORY"

-             "FILE-COMMENT"

              "GET-FLOATING-POINT-MODES" "SET-FLOATING-POINT-MODES"
              "WITH-FLOAT-TRAPS-MASKED"
              "DEFINE-HASH-TABLE-TEST"
              "GET-FLOATING-POINT-MODES" "SET-FLOATING-POINT-MODES"
              "WITH-FLOAT-TRAPS-MASKED"
              "DEFINE-HASH-TABLE-TEST"

@@ -812,14 +830,15 @@ retained, possibly temporariliy, because it might be used internally."
 integration' (said CMU CL architecture.tex) and that probably was and
 is a good idea, but see SB-SYS for blurring of boundaries."
     :use ("CL" "SB!ALIEN" "SB!ALIEN-INTERNALS" "SB!BIGNUM"
 integration' (said CMU CL architecture.tex) and that probably was and
 is a good idea, but see SB-SYS for blurring of boundaries."
     :use ("CL" "SB!ALIEN" "SB!ALIEN-INTERNALS" "SB!BIGNUM"

-          "SB!EXT" "SB!INT" "SB!SYS")
+          "SB!EXT" "SB!INT" "SB!SYS" "SB!GRAY")

     :import-from (("SB!C-CALL" "VOID"))
     :reexport ("DEF!STRUCT" "DEF!MACRO" "VOID")
     :export ("%ACOS" "%ACOSH" "%ARRAY-AVAILABLE-ELEMENTS"
              "%ARRAY-DATA-VECTOR" "%ARRAY-DIMENSION"
              "%ARRAY-DISPLACED-P"
              "%ARRAY-DISPLACEMENT" "%ARRAY-FILL-POINTER"
     :import-from (("SB!C-CALL" "VOID"))
     :reexport ("DEF!STRUCT" "DEF!MACRO" "VOID")
     :export ("%ACOS" "%ACOSH" "%ARRAY-AVAILABLE-ELEMENTS"
              "%ARRAY-DATA-VECTOR" "%ARRAY-DIMENSION"
              "%ARRAY-DISPLACED-P"
              "%ARRAY-DISPLACEMENT" "%ARRAY-FILL-POINTER"

-             "%ARRAY-FILL-POINTER-P" "%ASIN" "%ASINH"
+             "%ARRAY-FILL-POINTER-P"
+             "%ASIN" "%ASINH"

              "%ATAN" "%ATAN2" "%ATANH"
              "%CALLER-FRAME-AND-PC" "%CHECK-BOUND" "%CLOSURE-FUNCTION"
              "%CLOSURE-INDEX-REF" "%COS" "%COS-QUICK"
              "%ATAN" "%ATAN2" "%ATANH"
              "%CALLER-FRAME-AND-PC" "%CHECK-BOUND" "%CLOSURE-FUNCTION"
              "%CLOSURE-INDEX-REF" "%COS" "%COS-QUICK"

@@ -830,10 +849,10 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              "%HYPOT" "%INSTANCE-SET-CONDITIONAL" "%LDB"
              "%LOG" "%LOGB" "%LOG10" "%LOG1P" "%LONG-FLOAT"
              "%MAKE-COMPLEX" "%MAKE-FUNCALLABLE-INSTANCE" "%MAKE-RATIO"
              "%HYPOT" "%INSTANCE-SET-CONDITIONAL" "%LDB"
              "%LOG" "%LOGB" "%LOG10" "%LOG1P" "%LONG-FLOAT"
              "%MAKE-COMPLEX" "%MAKE-FUNCALLABLE-INSTANCE" "%MAKE-RATIO"

-            "%MAP-TO-SIMPLE-VECTOR-ARITY-1" "%MAP-TO-LIST-ARITY-1"
+             "%MAP" "%MAP-TO-SIMPLE-VECTOR-ARITY-1" "%MAP-TO-LIST-ARITY-1"

             "%MAP-TO-NIL-ON-SEQUENCE" "%MAP-TO-NIL-ON-SIMPLE-VECTOR"
              "%MAP-TO-NIL-ON-VECTOR" "%MASK-FIELD" "%NEGATE" "%POW"
             "%MAP-TO-NIL-ON-SEQUENCE" "%MAP-TO-NIL-ON-SIMPLE-VECTOR"
              "%MAP-TO-NIL-ON-VECTOR" "%MASK-FIELD" "%NEGATE" "%POW"

-             "%RAW-BITS" "%RAW-REF-COMPLEX-DOUBLE"
+             "%PUTHASH" "%RAW-BITS" "%RAW-REF-COMPLEX-DOUBLE"

              "%RAW-REF-COMPLEX-LONG"
              "%RAW-REF-COMPLEX-SINGLE" "%RAW-REF-DOUBLE"
              "%RAW-REF-LONG"
              "%RAW-REF-COMPLEX-LONG"
              "%RAW-REF-COMPLEX-SINGLE" "%RAW-REF-DOUBLE"
              "%RAW-REF-LONG"

@@ -900,8 +919,10 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              "*COLD-INIT-COMPLETE-P*"
              "!COLD-INIT-FORMS" "COMPLEX-DOUBLE-FLOAT-P"
              "COMPLEX-FLOAT-P" "COMPLEX-LONG-FLOAT-P"
              "*COLD-INIT-COMPLETE-P*"
              "!COLD-INIT-FORMS" "COMPLEX-DOUBLE-FLOAT-P"
              "COMPLEX-FLOAT-P" "COMPLEX-LONG-FLOAT-P"

-             "COMPLEX-RATIONAL-P" "COMPLEX-SINGLE-FLOAT-P"
-             "COMPLEX-VECTOR-P" "CONSED-SEQUENCE" "CONSTANT" "CONSTANT-TYPE"
+             "COMPLEX-RATIONAL-P" "COMPLEX-SINGLE-FLOAT-P" "COMPLEX-VECTOR-P"
+             "CONS-TYPE" "CONS-TYPE-CAR-TYPE" "CONS-TYPE-CDR-TYPE"
+             "CONS-TYPE-P"
+             "CONSED-SEQUENCE" "CONSTANT" "CONSTANT-TYPE"

              "CONSTANT-TYPE-P" "CONSTANT-TYPE-TYPE"
              "CONTAINING-INTEGER-TYPE"
              "CONTROL-STACK-POINTER-SAP" "COPY-FROM-SYSTEM-AREA"
              "CONSTANT-TYPE-P" "CONSTANT-TYPE-TYPE"
              "CONTAINING-INTEGER-TYPE"
              "CONTROL-STACK-POINTER-SAP" "COPY-FROM-SYSTEM-AREA"

@@ -937,7 +958,7 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              "HAIRY-DATA-VECTOR-REF" "HAIRY-DATA-VECTOR-SET" "HAIRY-TYPE"
              "HAIRY-TYPE-CHECK-TEMPLATE-NAME" "HAIRY-TYPE-SPECIFIER"
              "HANDLE-CIRCULARITY" "IGNORE-IT"
              "HAIRY-DATA-VECTOR-REF" "HAIRY-DATA-VECTOR-SET" "HAIRY-TYPE"
              "HAIRY-TYPE-CHECK-TEMPLATE-NAME" "HAIRY-TYPE-SPECIFIER"
              "HANDLE-CIRCULARITY" "IGNORE-IT"

-             "INDEX" "INDEX-TOO-LARGE-ERROR" "INTEGER-DECODE-DOUBLE-FLOAT"
+             "INDEX-TOO-LARGE-ERROR" "INTEGER-DECODE-DOUBLE-FLOAT"

              "INTEGER-DECODE-LONG-FLOAT" "INTEGER-DECODE-SINGLE-FLOAT"
              "INTERNAL-ERROR" "INTERNAL-TIME"
              "INVALID-ARGUMENT-COUNT-ERROR" "INVALID-ARRAY-INDEX-ERROR"
              "INTEGER-DECODE-LONG-FLOAT" "INTEGER-DECODE-SINGLE-FLOAT"
              "INTERNAL-ERROR" "INTERNAL-TIME"
              "INVALID-ARGUMENT-COUNT-ERROR" "INVALID-ARRAY-INDEX-ERROR"

@@ -954,8 +975,8 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              "LONG-FLOAT-LOW-BITS" "LONG-FLOAT-MID-BITS" "LONG-FLOAT-P"
              "LRA" "LRA-CODE-HEADER" "LRA-P"
              "MAKE-ALIEN-TYPE-TYPE" "MAKE-ARGS-TYPE"
              "LONG-FLOAT-LOW-BITS" "LONG-FLOAT-MID-BITS" "LONG-FLOAT-P"
              "LRA" "LRA-CODE-HEADER" "LRA-P"
              "MAKE-ALIEN-TYPE-TYPE" "MAKE-ARGS-TYPE"

-             "MAKE-ARRAY-HEADER" "MAKE-ARRAY-TYPE" "MAKE-DOUBLE-FLOAT"
-             "MAKE-FUNCTION-TYPE"
+             "MAKE-ARRAY-HEADER" "MAKE-ARRAY-TYPE" "MAKE-CONS-TYPE"
+             "MAKE-DOUBLE-FLOAT" "MAKE-FUNCTION-TYPE"

              "MAKE-KEY-INFO" "MAKE-LISP-OBJ" "MAKE-LONG-FLOAT"
              "MAKE-MEMBER-TYPE" "MAKE-NAMED-TYPE"
              "MAKE-NULL-LEXENV" "MAKE-NUMERIC-TYPE"
              "MAKE-KEY-INFO" "MAKE-LISP-OBJ" "MAKE-LONG-FLOAT"
              "MAKE-MEMBER-TYPE" "MAKE-NAMED-TYPE"
              "MAKE-NULL-LEXENV" "MAKE-NUMERIC-TYPE"

@@ -1026,7 +1047,8 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              #!+gengc "*SAVED-STATE-CHAIN*"
              "SCALE-DOUBLE-FLOAT" "SCALE-LONG-FLOAT"
              "SCALE-SINGLE-FLOAT"
              #!+gengc "*SAVED-STATE-CHAIN*"
              "SCALE-DOUBLE-FLOAT" "SCALE-LONG-FLOAT"
              "SCALE-SINGLE-FLOAT"

-             "SEQUENCE-END" "SET-HEADER-DATA" "SHIFT-TOWARDS-END"
+             "SEQUENCE-END" "SEQUENCE-OF-CHECKED-LENGTH-GIVEN-TYPE"
+             "SET-HEADER-DATA" "SHIFT-TOWARDS-END"

              "SHIFT-TOWARDS-START" "SHRINK-VECTOR" "SIGNED-BYTE-32-P"
              "SIMPLE-ARRAY-COMPLEX-DOUBLE-FLOAT-P"
              "SIMPLE-ARRAY-COMPLEX-LONG-FLOAT-P"
              "SHIFT-TOWARDS-START" "SHRINK-VECTOR" "SIGNED-BYTE-32-P"
              "SIMPLE-ARRAY-COMPLEX-DOUBLE-FLOAT-P"
              "SIMPLE-ARRAY-COMPLEX-LONG-FLOAT-P"

@@ -1067,7 +1089,7 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              "TYPE-DIFFERENCE" "TYPE-EXPAND"
              "TYPE-INTERSECT"
              "TYPE-INTERSECTION" "TYPE-SPECIFIER"
              "TYPE-DIFFERENCE" "TYPE-EXPAND"
              "TYPE-INTERSECT"
              "TYPE-INTERSECTION" "TYPE-SPECIFIER"

-             "*STANDARD-TYPE-NAMES*" "TYPE-UNION" "TYPE/=" "TYPE="
+             "TYPE-UNION" "TYPE/=" "TYPE="

              "TYPES-INTERSECT" "UNBOUND-SYMBOL-ERROR" "UNBOXED-ARRAY"
              "UNDEFINED-SYMBOL-ERROR" "UNION-TYPE" "UNION-TYPE-P"
              "UNION-TYPE-TYPES" "UNKNOWN-ERROR"
              "TYPES-INTERSECT" "UNBOUND-SYMBOL-ERROR" "UNBOXED-ARRAY"
              "UNDEFINED-SYMBOL-ERROR" "UNION-TYPE" "UNION-TYPE-P"
              "UNION-TYPE-TYPES" "UNKNOWN-ERROR"

@@ -1084,12 +1106,14 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              "VALUES-TYPES" "VALUES-TYPES-INTERSECT" "VECTOR-T-P"
              "VECTOR-TO-VECTOR*" "VECTOR-TO-SIMPLE-STRING*"
              "VECTOR-TO-BIT-VECTOR*" "VECTOR-TO-SIMPLE-BIT-VECTOR*"
              "VALUES-TYPES" "VALUES-TYPES-INTERSECT" "VECTOR-T-P"
              "VECTOR-TO-VECTOR*" "VECTOR-TO-SIMPLE-STRING*"
              "VECTOR-TO-BIT-VECTOR*" "VECTOR-TO-SIMPLE-BIT-VECTOR*"

+             "VECTOR-OF-CHECKED-LENGTH-GIVEN-LENGTH"

              "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"
              "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*"
              "%SET-SYMBOL-PLIST" "INFINITE-ERROR-PROTECT"
              "FIND-CALLER-NAME"
              "FUNCTION-SUBTYPE" "*MAXIMUM-ERROR-DEPTH*"
              "%SET-SYMBOL-PLIST" "INFINITE-ERROR-PROTECT"
              "FIND-CALLER-NAME"

@@ -1160,16 +1184,22 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              "SIMPLE-CONTROL-ERROR" "SIMPLE-FILE-ERROR"
              "SIMPLE-PROGRAM-ERROR" "SIMPLE-STYLE-WARNING" "STYLE-WARN"
 
              "SIMPLE-CONTROL-ERROR" "SIMPLE-FILE-ERROR"
              "SIMPLE-PROGRAM-ERROR" "SIMPLE-STYLE-WARNING" "STYLE-WARN"
 

-            "!COLD-INIT"
+             ;; symbols from former SB!CONDITIONS
+             "*HANDLER-CLUSTERS*" "*RESTART-CLUSTERS*"
+             "SHOW-CONDITION" "CASE-FAILURE"
+             "NAMESTRING-PARSE-ERROR" "NAMESTRING-PARSE-ERROR-OFFSET"
+             "DESCRIBE-CONDITION"
+             
+            "!COLD-INIT" "!UNINTERN-INIT-ONLY-STUFF"

              "!GLOBALDB-COLD-INIT" "!FDEFN-COLD-INIT"
              "!TYPE-CLASS-COLD-INIT" "!TYPEDEFS-COLD-INIT"
              "!ALIEN-TYPE-COLD-INIT" "!CLASSES-COLD-INIT"
              "!EARLY-TYPE-COLD-INIT" "!LATE-TYPE-COLD-INIT"
              "!TARGET-TYPE-COLD-INIT" "!RANDOM-COLD-INIT"
              "!GLOBALDB-COLD-INIT" "!FDEFN-COLD-INIT"
              "!TYPE-CLASS-COLD-INIT" "!TYPEDEFS-COLD-INIT"
              "!ALIEN-TYPE-COLD-INIT" "!CLASSES-COLD-INIT"
              "!EARLY-TYPE-COLD-INIT" "!LATE-TYPE-COLD-INIT"
              "!TARGET-TYPE-COLD-INIT" "!RANDOM-COLD-INIT"

-             "!FILESYS-COLD-INIT" "!READER-COLD-INIT"
+             "!READER-COLD-INIT"

              "STREAM-COLD-INIT-OR-RESET" "!LOADER-COLD-INIT"
              "!PACKAGE-COLD-INIT" "SIGNAL-COLD-INIT-OR-REINIT"
              "STREAM-COLD-INIT-OR-RESET" "!LOADER-COLD-INIT"
              "!PACKAGE-COLD-INIT" "SIGNAL-COLD-INIT-OR-REINIT"

-             "!SET-SANE-COOKIE-DEFAULTS" "!VM-TYPE-COLD-INIT"
+            "!POLICY-COLD-INIT-OR-RESANIFY" "!VM-TYPE-COLD-INIT"

              "!BACKQ-COLD-INIT" "!SHARPM-COLD-INIT"
             "!CLASS-FINALIZE" "GC-COLD-INIT-OR-REINIT"
 
              "!BACKQ-COLD-INIT" "!SHARPM-COLD-INIT"
             "!CLASS-FINALIZE" "GC-COLD-INIT-OR-REINIT"
 

@@ -1192,20 +1222,7 @@ is a good idea, but see SB-SYS for blurring of boundaries."
              "%SETELT" "%SET-ROW-MAJOR-AREF" "%SET-FILL-POINTER"
              "%SET-FDEFINITION" "%SCHARSET" "%SBITSET" "%RPLACD"
              "%RPLACA" "%PUT" "%CHARSET" "%BITSET" "%ASET"
              "%SETELT" "%SET-ROW-MAJOR-AREF" "%SET-FILL-POINTER"
              "%SET-FDEFINITION" "%SCHARSET" "%SBITSET" "%RPLACD"
              "%RPLACA" "%PUT" "%CHARSET" "%BITSET" "%ASET"

-             "%ARRAY-TYPEP" "%SET-SAP-REF-DESCRIPTOR"
-
-             ;; Note: These are out of lexicographical order only because
-             ;; historically in CMU CL they were imported into package VM
-             ;; from LISP instead of being exported from package VM. In
-             ;; SBCL we achieve more or less the same effect by putting them
-             ;; in SB!KERNEL, where they're visible both in SB!IMPL and in
-             ;; SB!VM. But as far as I can tell, though, there's no
-             ;; fundamental reason that they're different from the other
-             ;; exports. -- WHN 19991020
-             "STATIC-SPACE-START" "READ-ONLY-SPACE-START"
-             "DYNAMIC-1-SPACE-START" "DYNAMIC-0-SPACE-START"
-             "CURRENT-DYNAMIC-SPACE-START" "*STATIC-SPACE-FREE-POINTER*"
-             "*READ-ONLY-SPACE-FREE-POINTER*"))
+             "%ARRAY-TYPEP" "%SET-SAP-REF-DESCRIPTOR"))

 
  #s(sb-cold:package-data
     :name "SB!LOOP"
 
  #s(sb-cold:package-data
     :name "SB!LOOP"

@@ -1360,8 +1377,7 @@ and even SB-VM have become somewhat blurred over the years."
              "BYTES" "C-PROCEDURE" "CHECK<=" "CHECK="
              "COMPILER-VERSION"
              "DEALLOCATE-SYSTEM-MEMORY"
              "BYTES" "C-PROCEDURE" "CHECK<=" "CHECK="
              "COMPILER-VERSION"
              "DEALLOCATE-SYSTEM-MEMORY"

-             "DEFAULT-INTERRUPT" "DEFENUMERATION"
-             "DEFOPERATOR" "DEFRECORD"
+             "DEFAULT-INTERRUPT"

              "DEPORT-BOOLEAN" "DEPORT-INTEGER"
              "DO-DO-BODY" "DOUBLE-FLOAT-RADIX"
              "ENABLE-INTERRUPT" "ENUMERATION"
              "DEPORT-BOOLEAN" "DEPORT-INTEGER"
              "DO-DO-BODY" "DOUBLE-FLOAT-RADIX"
              "ENABLE-INTERRUPT" "ENUMERATION"

@@ -1584,8 +1600,8 @@ structure representations"
              "CONS-SIZE" "CONSTANT-SC-NUMBER"
              "CONTEXT-FLOATING-POINT-MODES" "CONTEXT-FLOAT-REGISTER"
              "CONTEXT-PC" "CONTEXT-REGISTER"
              "CONS-SIZE" "CONSTANT-SC-NUMBER"
              "CONTEXT-FLOATING-POINT-MODES" "CONTEXT-FLOAT-REGISTER"
              "CONTEXT-PC" "CONTEXT-REGISTER"

-             "CONTROL-STACK-FORK" "CONTROL-STACK-RESUME"
-             "CONTROL-STACK-RETURN" "CONTROL-STACK-SC-NUMBER" "COUNT-NO-OPS"
+             "CONTROL-STACK-SC-NUMBER" "COUNT-NO-OPS"
+             "CURRENT-DYNAMIC-SPACE-START"

              "CURRENT-FLOAT-TRAP" "DEFINE-FOR-EACH-PRIMITIVE-OBJECT"
              "DESCRIPTOR-REG-SC-NUMBER" "DESCRIPTOR-VS-NON-DESCRIPTOR-STORAGE"
              "DOUBLE-FLOAT-EXPONENT-BYTE" "DOUBLE-FLOAT-BIAS"
              "CURRENT-FLOAT-TRAP" "DEFINE-FOR-EACH-PRIMITIVE-OBJECT"
              "DESCRIPTOR-REG-SC-NUMBER" "DESCRIPTOR-VS-NON-DESCRIPTOR-STORAGE"
              "DOUBLE-FLOAT-EXPONENT-BYTE" "DOUBLE-FLOAT-BIAS"

@@ -1623,7 +1639,7 @@ structure representations"
              "FUNCALLABLE-INSTANCE-LEXENV-SLOT"
              "GENESIS" "HALT-TRAP" "IGNORE-ME-SC-NUMBER"
              "IMMEDIATE-BASE-CHAR-SC-NUMBER" "IMMEDIATE-SAP-SC-NUMBER"
              "FUNCALLABLE-INSTANCE-LEXENV-SLOT"
              "GENESIS" "HALT-TRAP" "IGNORE-ME-SC-NUMBER"
              "IMMEDIATE-BASE-CHAR-SC-NUMBER" "IMMEDIATE-SAP-SC-NUMBER"

-             "IMMEDIATE-SC-NUMBER"
+             "IMMEDIATE-SC-NUMBER" "*INITIAL-DYNAMIC-SPACE-FREE-POINTER*"

              "INSTANCE-HEADER-TYPE" "INSTANCE-POINTER-TYPE"
              "INSTANCE-SLOTS-OFFSET" "INSTANCE-USAGE"
              "INTERIOR-REG-SC-NUMBER" "INTERNAL-ERROR-ARGUMENTS"
              "INSTANCE-HEADER-TYPE" "INSTANCE-POINTER-TYPE"
              "INSTANCE-SLOTS-OFFSET" "INSTANCE-USAGE"
              "INTERIOR-REG-SC-NUMBER" "INTERNAL-ERROR-ARGUMENTS"

@@ -1648,6 +1664,7 @@ structure representations"
              "PRIMITIVE-OBJECT-VARIABLE-LENGTH" "PRINT-ALLOCATED-OBJECTS"
              "RANDOM-IMMEDIATE-SC-NUMBER" "RATIO-DENOMINATOR-SLOT"
              "RATIO-NUMERATOR-SLOT" "RATIO-SIZE" "RATIO-TYPE"
              "PRIMITIVE-OBJECT-VARIABLE-LENGTH" "PRINT-ALLOCATED-OBJECTS"
              "RANDOM-IMMEDIATE-SC-NUMBER" "RATIO-DENOMINATOR-SLOT"
              "RATIO-NUMERATOR-SLOT" "RATIO-SIZE" "RATIO-TYPE"

+             "*READ-ONLY-SPACE-FREE-POINTER*"

              "REGISTER-SAVE-PENALTY" "RETURN-PC-HEADER-TYPE"
              "RETURN-PC-RETURN-POINT-OFFSET" "SANCTIFY-FOR-EXECUTION"
              "SAP-POINTER-SLOT" "SAP-REG-SC-NUMBER" "SAP-SIZE"
              "REGISTER-SAVE-PENALTY" "RETURN-PC-HEADER-TYPE"
              "RETURN-PC-RETURN-POINT-OFFSET" "SANCTIFY-FOR-EXECUTION"
              "SAP-POINTER-SLOT" "SAP-REG-SC-NUMBER" "SAP-SIZE"

@@ -1681,18 +1698,23 @@ structure representations"
              "SINGLE-VALUE-RETURN-BYTE-OFFSET" "SLOT-DOCS"
              "SLOT-LENGTH" "SLOT-NAME" "SLOT-OFFSET" "SLOT-OPTIONS"
              "SLOT-REST-P" "*STATIC-FUNCTIONS*" "STATIC-FUNCTION-OFFSET"
              "SINGLE-VALUE-RETURN-BYTE-OFFSET" "SLOT-DOCS"
              "SLOT-LENGTH" "SLOT-NAME" "SLOT-OFFSET" "SLOT-OPTIONS"
              "SLOT-REST-P" "*STATIC-FUNCTIONS*" "STATIC-FUNCTION-OFFSET"

-             "STATIC-SYMBOL-OFFSET" "STATIC-SYMBOL-P" "*STATIC-SYMBOLS*"
+             "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"
              "SYMBOL-PACKAGE-SLOT" "SYMBOL-PLIST-SLOT"
              "SYMBOL-RAW-FUNCTION-ADDR-SLOT" "SYMBOL-SETF-FUNCTION-SLOT"
              "SYMBOL-SIZE" "SYMBOL-UNUSED-SLOT" "SYMBOL-VALUE-SLOT"
              "STRUCTURE-USAGE" "SYMBOL-FUNCTION-SLOT"
              "SYMBOL-HASH-SLOT" "SYMBOL-HEADER-TYPE" "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"

-             "TARGET-BINDING-STACK-START" "TARGET-BYTE-ORDER"
-             "TARGET-CONTROL-STACK-START" "*TARGET-DYNAMIC-SPACE-START*"
+             "BINDING-STACK-START" "BINDING-STACK-END" 
+             "CONTROL-STACK-START" "CONTROL-STACK-END"
+             "DYNAMIC-SPACE-START" "DYNAMIC-SPACE-END"
+             "READ-ONLY-SPACE-START" "READ-ONLY-SPACE-END"
+             "TARGET-BYTE-ORDER"

              "TARGET-FASL-CODE-FORMAT" "TARGET-FASL-FILE-TYPE"
              "TARGET-HEAP-ADDRESS-SPACE" "*TARGET-MOST-NEGATIVE-FIXNUM*"
              "TARGET-FASL-CODE-FORMAT" "TARGET-FASL-FILE-TYPE"
              "TARGET-HEAP-ADDRESS-SPACE" "*TARGET-MOST-NEGATIVE-FIXNUM*"

-             "*TARGET-MOST-POSITIVE-FIXNUM*" "*TARGET-READ-ONLY-SPACE-START*"
-             "*TARGET-STATIC-SPACE-START*" "TRACE-TABLE-CALL-SITE"
+             "*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"
              "UNSIGNED-IMMEDIATE-SC-NUMBER"
              "TRACE-TABLE-FUNCTION-EPILOGUE" "TRACE-TABLE-FUNCTION-PROLOGUE"
              "TRACE-TABLE-NORMAL" "TYPE-BITS" "TYPE-MASK" "UNBOUND-MARKER-TYPE"
              "UNSIGNED-IMMEDIATE-SC-NUMBER"

@@ -1713,8 +1735,12 @@ structure representations"
     :doc "internal: a code walker used by PCL"
     :use ("CL")
     :export ("DEFINE-WALKER-TEMPLATE" "WALK-FORM"
     :doc "internal: a code walker used by PCL"
     :use ("CL")
     :export ("DEFINE-WALKER-TEMPLATE" "WALK-FORM"

-             "*WALK-FORM-EXPAND-MACROS-P*" "NESTED-WALK-FORM"
+             "*WALK-FORM-EXPAND-MACROS-P*" 

              "VARIABLE-LEXICAL-P" "VARIABLE-SPECIAL-P"
              "VARIABLE-GLOBALLY-SPECIAL-P"
              "*VARIABLE-DECLARATIONS*" "VARIABLE-DECLARATION"
              "VARIABLE-LEXICAL-P" "VARIABLE-SPECIAL-P"
              "VARIABLE-GLOBALLY-SPECIAL-P"
              "*VARIABLE-DECLARATIONS*" "VARIABLE-DECLARATION"

-             "MACROEXPAND-ALL")))
+
+             ;; These were exported from the original PCL version of this 
+             ;; package, but aren't used in SBCL.
+             ;;"NESTED-WALK-FORM" "MACROEXPAND-ALL"
+             )))