diff --git a/code/exports.lisp b/code/exports.lisp
index 0b84598df628706d92c2a2e452cee2cfc3254509..76278bd7ee8c9db894440eb5e3c4bb1c830f5436 100644
--- a/code/exports.lisp
+++ b/code/exports.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/exports.lisp,v 1.126 1997/09/07 23:33:58 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/exports.lisp,v 1.127 1997/09/08 02:28:18 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -628,6 +628,7 @@
              "STATIC-SPACE-START" "STRING/=*" "STRING<*" "STRING<=*" "STRING=*"
              "STRING>*" "STRING>=*")
   (: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"
@@ -635,7 +636,9 @@
 	   "BASE-CHAR-STACK-SC-NUMBER" "BASE-CHAR-TYPE"
 	   "BIGNUM-DIGITS-OFFSET" "BIGNUM-TYPE" "BINDING-SIZE"
 	   "BINDING-SYMBOL-SLOT" "BINDING-VALUE-SLOT" "BREAKPOINT-TRAP"
-	   "BYTE-BITS" "CATCH-BLOCK-CURRENT-CODE-SLOT"
+	   "BYTE-CODE-CLOSURE-TYPE" "BYTE-CODE-FUNCTION-TYPE"
+	   "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"
@@ -650,7 +653,8 @@
 	   "COMPLEX-VECTOR-TYPE" "CONS-CAR-SLOT" "CONS-CDR-SLOT" "CONS-SIZE"
 	   "CONSTANT-SC-NUMBER" "CONTROL-STACK-SC-NUMBER" "COUNT-NO-OPS"
 	   "CURRENT-FLOAT-TRAP" "DEFINE-FOR-EACH-PRIMITIVE-OBJECT"
-	   "DESCRIPTOR-REG-SC-NUMBER" "DESCRIPTOR-VS-NON-DESCRIPTOR-STORAGE"
+	   "DESCRIPTOR-REG-SC-NUMBER" "DESCRIPTOR-STACK-SC-NUMBER"
+	   "DESCRIPTOR-VS-NON-DESCRIPTOR-STORAGE"
 	   "DOUBLE-FLAOT-EXPONENT-BYTE" "DOUBLE-FLOAT-BIAS"
 	   "DOUBLE-FLOAT-DIGITS" "DOUBLE-FLOAT-EXPONENT-BYTE"
 	   "DOUBLE-FLOAT-FILLER-SLOT" "DOUBLE-FLOAT-HIDDEN-BIT"
@@ -658,30 +662,46 @@
 	   "DOUBLE-FLOAT-NORMAL-EXPONENT-MIN" "DOUBLE-FLOAT-SIGNIFICAND-BYTE"
 	   "DOUBLE-FLOAT-SIZE" "DOUBLE-FLOAT-TRAPPING-NAN-BIT"
 	   "DOUBLE-FLOAT-TYPE" "DOUBLE-FLOAT-VALUE-SLOT"
-	   #+SGI "DOUBLE-INT-CARG-REG-SC-NUMBER"
-	   "DOUBLE-REG-SC-NUMBER" "DOUBLE-STACK-SC-NUMBER" "ERROR-TRAP"
-	   "EVEN-FIXNUM-TYPE" "EXPORTED-STATIC-SYMBOLS" "FIND-HOLES" "FIXNUM"
+	   "DOUBLE-INT-CARG-REG-SC-NUMBER" "DOUBLE-REG-SC-NUMBER"
+	   "DOUBLE-STACK-SC-NUMBER" "DWORD-REG-SC-NUMBER"
+	   "DYLAN-FUNCTION-HEADER-TYPE" "ERROR-TRAP"
+	   "EVEN-FIXNUM-TYPE" "EXPORTED-STATIC-SYMBOLS" "EXTERN-ALIEN-NAME"
+	   "FDEFN-FUNCTION-SLOT" "FDEFN-NAME-SLOT" "FDEFN-RAW-ADDR-SLOT"
+	   "FDEFN-SIZE" "FDEFN-TYPE" "FIND-HOLES" "FIXNUM"
 	   "FIXUP-CODE-OBJECT" "FLOAT-DENORMAL-TRAP-BIT"
 	   "FLOAT-DIVIDE-BY-ZERO-TRAP-BIT"
 	   "FLOAT-IMPRECISE-TRAP-BIT" "FLOAT-INVALID-TRAP-BIT"
 	   "FLOAT-OVERFLOW-TRAP-BIT" "FLOAT-SIGN-SHIFT"
 	   "FLOAT-UNDERFLOW-TRAP-BIT" "FLOATING-POINT-MODES"
+	   "FORWARDING-POINTER-TYPE"
+	   "FP-DOUBLE-CONSTANT-SC-NUMBER" "FP-DOUBLE-ZERO-SC-NUMBER"
+	   "FP-SINGLE-CONSTANT-SC-NUMBER" "FP-SINGLE-ZERO-SC-NUMBER"
 	   "FUNCALLABLE-INSTANCE-FUNCTION-SLOT"
-	   "FUNCALLABLE-INSTANCE-HEADER-TYPE"
-	   "FUNCALLABLE-INSTANCE-INFO-OFFSET" "FUNCTION-END-BREAKPOINT-TRAP"
-	   "FUNCTION-HEADER-ARGLIST-SLOT" "FUNCTION-HEADER-CODE-OFFSET"
-	   "FUNCTION-HEADER-NAME-SLOT" "FUNCTION-HEADER-NEXT-SLOT"
-	   "FUNCTION-HEADER-SELF-SLOT" "FUNCTION-HEADER-TYPE"
-	   "FUNCTION-HEADER-TYPE-SLOT" "FUNCTION-POINTER-TYPE" "GENESIS"
-	   "HALT-TRAP" "IMMEDIATE-BASE-CHAR-SC-NUMBER"
-	   "IMMEDIATE-SAP-SC-NUMBER" "IMMEDIATE-SC-NUMBER"
+	   "FUNCALLABLE-INSTANCE-HEADER-TYPE" 
+	   "FUNCALLABLE-INSTANCE-INFO-OFFSET"
+	   "FUNCTION-ARGLIST-SLOT" "FUNCTION-CODE-OFFSET"
+	   "FUNCTION-END-BREAKPOINT-TRAP" "FUNCTION-HEADER-ARGLIST-SLOT"
+	   "FUNCTION-HEADER-CODE-OFFSET" "FUNCTION-HEADER-NAME-SLOT"
+	   "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"
+	   "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"
+	   "INSTANCE-HEADER-TYPE" "INSTANCE-POINTER-TYPE"
+	   "INSTANCE-SLOTS-OFFSET" "INSTANCE-USAGE"
 	   "INTERIOR-REG-SC-NUMBER" "INTERNAL-ERROR-ARGUMENTS"
-	   "INTERRUPTED-FLAG" "LIST-POINTER-TYPE" "LOWTAG-BITS"
-	   "LOWTAG-LIMIT" "LOWTAG-MASK" "MEMORY-USAGE" "MOST-POSITIVE-COST"
+	   "INTERRUPTED-FLAG" "LIST-ALLOCATED-OBJECTS" "LIST-POINTER-TYPE"
+	   "LOWTAG-BITS" "LOWTAG-LIMIT" "LOWTAG-MASK"
+	   "MEMORY-USAGE" "MOST-POSITIVE-COST"
 	   "NEGATIVE-IMMEDIATE-SC-NUMBER" "NON-DESCRIPTOR-REG-SC-NUMBER"
-	   "NULL-SC-NUMBER" "ODD-FIXNUM-TYPE" "OFFSET-STATIC-SYMBOL"
-	   "OTHER-IMMEDIATE-0-TYPE" "OTHER-IMMEDIATE-1-TYPE"
-	   "OTHER-POINTER-TYPE" "PAD-DATA-BLOCK" "PENDING-INTERRUPT-TRAP"
+	   "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"
+	   "PAD-DATA-BLOCK" "PENDING-INTERRUPT-TRAP"
 	   "PRIMITIVE-OBJECT" "PRIMITIVE-OBJECT-HEADER"
 	   "PRIMITIVE-OBJECT-LOWTAG" "PRIMITIVE-OBJECT-NAME"
 	   "PRIMITIVE-OBJECT-OPTIONS" "PRIMITIVE-OBJECT-P"
@@ -690,8 +710,14 @@
 	   "RANDOM-IMMEDIATE-SC-NUMBER" "RATIO-DENOMINATOR-SLOT"
 	   "RATIO-NUMERATOR-SLOT" "RATIO-SIZE" "RATIO-TYPE"
 	   "REGISTER-SAVE-PENALTY" "RETURN-PC-HEADER-TYPE"
-	   "RETURN-PC-RETURN-POINT-OFFSET" "SAP-POINTER-SLOT"
-	   "SAP-REG-SC-NUMBER" "SAP-SIZE" "SAP-STACK-SC-NUMBER" "SAP-TYPE"
+	   "RETURN-PC-RETURN-POINT-OFFSET" "SANCTIFY-FOR-EXECUTION"
+	   "SAP-POINTER-SLOT" "SAP-REG-SC-NUMBER" "SAP-SIZE"
+	   "SAP-STACK-SC-NUMBER" "SAP-TYPE"
+	   "SCAVENGER-HOOK-FUNCTION-SLOT" "SCAVENGER-HOOK-SIZE"
+	   "SCAVENGER-HOOK-TYPE" "SCAVENGER-HOOK-VALUE-SLOT"
+	   "SCAVENGER-HOOK-NEXT-SLOT"
+	   "SIGCONTEXT-FLOATING-POINT-MODES" "SIGCONTEXT-FLOAT-REGISTER"
+	   "SIGCONTEXT-PROGRAM-COUNTER" "SIGCONTEXT-REGISTER"
 	   "SIGFPE-HANDLER" "SIGNED-REG-SC-NUMBER" "SIGNED-STACK-SC-NUMBER"
 	   "SIMPLE-ARRAY-DOUBLE-FLOAT-TYPE" "SIMPLE-ARRAY-SINGLE-FLOAT-TYPE"
 	   "SIMPLE-ARRAY-TYPE" "SIMPLE-ARRAY-UNSIGNED-BYTE-16-TYPE"
@@ -710,15 +736,18 @@
 	   "SINGLE-FLOAT-NORMAL-EXPONENT-MIN" "SINGLE-FLOAT-SIGNIFICAND-BYTE"
 	   "SINGLE-FLOAT-SIZE" "SINGLE-FLOAT-TRAPPING-NAN-BIT"
 	   "SINGLE-FLOAT-TYPE" "SINGLE-FLOAT-VALUE-SLOT"
-           #+SGI "SINGLE-INT-CARG-REG-SC-NUMBER"
-	   "SINGLE-REG-SC-NUMBER" "SINGLE-STACK-SC-NUMBER" "SLOT-DOCS"
+           "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-SYMBOL-OFFSET" "STATIC-SYMBOL-P"
-	   "STATIC-SYMBOLS" "INSTANCE-HEADER-TYPE" "INSTANCE-POINTER-TYPE"
-	   "INSTANCE-SLOTS-OFFSET" "STRUCTURE-USAGE" "SYMBOL-FUNCTION-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-VALUE-SLOT"
+	   "SLOT-REST-P" "STATIC-FUNCTIONS" "STATIC-FUNCTION-OFFSET"
+	   "STATIC-SYMBOL-OFFSET" "STATIC-SYMBOL-P" "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"
 	   "TARGET-BINDING-STACK-START" "TARGET-BYTE-ORDER"
 	   "TARGET-CONTROL-STACK-START" "TARGET-DYNAMIC-SPACE-START"
 	   "TARGET-FASL-CODE-FORMAT" "TARGET-FASL-FILE-TYPE"
@@ -737,39 +766,9 @@
 	   "VECTOR-VALID-HASHING-SUBTYPE"
 	   "WEAK-POINTER-BROKEN-SLOT" "WEAK-POINTER-NEXT-SLOT"
 	   "WEAK-POINTER-SIZE" "WEAK-POINTER-TYPE" "WEAK-POINTER-VALUE-SLOT"
-	   "WORD-BITS" "WORD-BYTES" "WORD-SHIFT" "ZERO-SC-NUMBER"
-	   "SIGCONTEXT-FLOATING-POINT-MODES" "SIGCONTEXT-FLOAT-REGISTER"
-	   "SIGCONTEXT-PROGRAM-COUNTER" "SIGCONTEXT-REGISTER"
-	   "EXTERN-ALIEN-NAME" "SANCTIFY-FOR-EXECUTION"
-	   "FUNCTION-ARGLIST-SLOT"
-	   "INSTANCE-USAGE"
-	   "SINGLE-VALUE-RETURN-BYTE-OFFSET"
-	   "FDEFN-SIZE"
-	   "STATIC-FUNCTIONS"
-	   "FDEFN-NAME-SLOT"
-	   "SYMBOL-UNUSED-SLOT"
-	   "FDEFN-TYPE"
-	   "FDEFN-FUNCTION-SLOT"
-	   "FDEFN-RAW-ADDR-SLOT"
-	   "FORWARDING-POINTER-TYPE"
-	   "FUNCTION-NEXT-SLOT"
-	   "FUNCTION-SELF-SLOT"
-	   "AFTER-BREAKPOINT-TRAP"
-	   "FUNCTION-TYPE-SLOT"
-	   "FUNCTION-CODE-OFFSET"
-	   "BYTE-CODE-FUNCTION-TYPE"
-	   "STATIC-FUNCTION-OFFSET"
-	   "BYTE-CODE-CLOSURE-TYPE"
-	   "SCAVENGER-HOOK-TYPE"
-	   "FUNCTION-NAME-SLOT"
-	   "DYLAN-FUNCTION-HEADER-TYPE"
-	   "LIST-ALLOCATED-OBJECTS"
-	   "FUNCALLABLE-INSTANCE-LAYOUT-SLOT"
-	   "FUNCALLABLE-INSTANCE-LEXENV-SLOT"
-	   "FP-DOUBLE-ZERO-SC-NUMBER" "FP-SINGLE-ZERO-SC-NUMBER"
-	   "SINGLE-STEP-BREAKPOINT-TRAP"
-	   #+sparc "OBJECT-NOT-LIST-TRAP"
-	   #+sparc "OBJECT-NOT-INSTANCE-TRAP"))
+	   "WORD-BITS" "WORD-BYTES" "WORD-REG-SC-NUMBER" "WORD-SHIFT"
+	   "ZERO-SC-NUMBER"
+	   ))
 
 (defpackage "CONDITIONS")
 (intern "DISASSEMBLE" "LISP")