Remove last vestiges of IN-PACKAGE.

diff --git a/src/microcode/gcloop.c b/src/microcode/gcloop.c
index d469fb3b3df312d4dd32acb223b4962b9b4f0a29..96768474c1bceb55d3a6d968a9029564e364036b 100644 (file)
--- a/src/microcode/gcloop.c
+++ b/src/microcode/gcloop.c
@@ -1284,7 +1284,7 @@ gc_type_t gc_type_map [N_TYPE_CODES] =
   GC_SPECIAL,                  /* TC_BROKEN_HEART */
   GC_PAIR,                     /* TC_ASSIGNMENT */
   GC_TRIPLE,                   /* TC_HUNK3_B */
-  GC_PAIR,                     /* TC_IN_PACKAGE */
+  GC_UNDEFINED,                        /* unused */
   GC_VECTOR,                   /* TC_COMBINATION */
   GC_SPECIAL,                  /* TC_MANIFEST_NM_VECTOR */
   GC_COMPILED,                 /* TC_COMPILED_ENTRY */

diff --git a/src/microcode/interp.c b/src/microcode/interp.c
index dfda83b877d27dd2d744b6c138db2d060189ed14..b0591a28cddf6c17bf2c2a75b6d5d556b3086211 100644 (file)
--- a/src/microcode/interp.c
+++ b/src/microcode/interp.c
@@ -517,10 +517,6 @@ Interpret (int pop_return_p)
       Free += 2;
       break;
 
-    case TC_IN_PACKAGE:
-      Will_Push (CONTINUATION_SIZE);
-      PUSH_NTH_THEN (RC_EXECUTE_IN_PACKAGE_CONTINUE, IN_PACKAGE_ENVIRONMENT);
-
     case TC_LAMBDA:
     case TC_LEXPR:
       /* Deliberately omitted: EVAL_GC_CHECK (2); */
@@ -842,15 +838,6 @@ Interpret (int pop_return_p)
         POP_RETURN_ERROR (result);
       }
 
-    case RC_EXECUTE_IN_PACKAGE_CONTINUE:
-      if (ENVIRONMENT_P (GET_VAL))
-       {
-         END_SUBPROBLEM ();
-         SET_ENV (GET_VAL);
-         REDUCES_TO_NTH (IN_PACKAGE_EXPRESSION);
-       }
-      POP_RETURN_ERROR (ERR_BAD_FRAME);
-
     case RC_HALT:
       Microcode_Termination (TERM_TERM_HANDLER);
 

diff --git a/src/microcode/returns.h b/src/microcode/returns.h
index 289f7ea0ac205d738a06943c11f0560dd25534b2..0f9375d236f1662164fbaf67639617b8e541578a 100644 (file)
--- a/src/microcode/returns.h
+++ b/src/microcode/returns.h
@@ -38,7 +38,7 @@ USA.
 #define RC_EXECUTE_ASSIGNMENT_FINISH   0x08
 #define RC_EXECUTE_DEFINITION_FINISH   0x09
 #define RC_EXECUTE_ACCESS_FINISH       0x0A
-#define RC_EXECUTE_IN_PACKAGE_CONTINUE  0x0B
+/* unused                              0x0B */
 #define RC_SEQ_2_DO_2                  0x0C
 #define RC_SEQ_3_DO_2                  0x0D
 #define RC_SEQ_3_DO_3                  0x0E
@@ -107,7 +107,7 @@ USA.
 /* 0x08 */             "assignment-continue",                          \
 /* 0x09 */             "definition-continue",                          \
 /* 0x0a */             "access-continue",                              \
-/* 0x0b */             "in-package-continue",                          \
+/* 0x0b */             0,                                              \
 /* 0x0c */             "sequence-2-second",                            \
 /* 0x0d */             "sequence-3-second",                            \
 /* 0x0e */             "sequence-3-third",                             \

diff --git a/src/microcode/scode.h b/src/microcode/scode.h
index b428cced6c2c343bb1f3071bef97ba4d326a9a62..a04ea13c28ee147cefefa068f8c496ef33773f37 100644 (file)
--- a/src/microcode/scode.h
+++ b/src/microcode/scode.h
@@ -122,10 +122,6 @@ USA.
 #define Elambda_Rest_Flag(Addr) \
      ((((long) Addr) & EL_REST_MASK) >> EL_REST_SHIFT)
 \f
-/* IN-PACKAGE operation: */
-#define IN_PACKAGE_ENVIRONMENT 0
-#define IN_PACKAGE_EXPRESSION  1
-
 /* LAMBDA operation:
  * Object representing a LAMBDA expression with a fixed number of
  * arguments.  It consists of a list of the names of the arguments

diff --git a/src/microcode/typename.txt b/src/microcode/typename.txt
index fbb6a1a0f6a2fd32516927df36e31cba3c6175ab..a34e72b2b791b0e380dd24f180feb778f4c0a904 100644 (file)
--- a/src/microcode/typename.txt
+++ b/src/microcode/typename.txt
@@ -31,37 +31,38 @@
 1A     68     FIXNUM                      2E     B8     FUTURE
 1B     6C     PCOMB1                      20     80     HUNK3-A
 1C     70     CONTROL-POINT               24     90     HUNK3-B
-1D     74     INTERNED-SYMBOL             25     94     IN-PACKAGE
-1E     78     CHARACTER-STRING            1D     74     INTERNED-SYMBOL
-1F     7C     ACCESS                      17     5C     LAMBDA
-20     80     HUNK3-A                     29     A4     LEXPR
-21     84     DEFINITION                  39     E4     LINKAGE-SECTION
-22     88     BROKEN-HEART                01     04     LIST
-23     8C     ASSIGNMENT                  0D     34     MANIFEST-CLOSURE
-24     90     HUNK3-B                     27     9C     MANIFEST-NM-VECTOR
-25     94     IN-PACKAGE                  2B     AC     EPHEMERON
-26     98     COMBINATION                 16     58     NON-MARKED-VECTOR
-27     9C     MANIFEST-NM-VECTOR          00     00     NULL
-28     A0     COMPILED-ENTRY              30     C0     PCOMB0
-29     A4     LEXPR                       1B     6C     PCOMB1
-2A     A8     PCOMB3                      04     10     PCOMB2
-2B     AC     EPHEMERON                   2A     A8     PCOMB3
-2C     B0     VARIABLE                    18     60     PRIMITIVE
-2D     B4     THE-ENVIRONMENT             0F     3C     PROCEDURE
-2E     B8     FUTURE                      38     E0     QUAD
-2F     BC     VECTOR-1B                   3A     E8     RATNUM
-30     C0     PCOMB0                      3E     F8     RECORD
-31     C4     VECTOR-16B                  32     C8     REFERENCE-TRAP
-32     C8     REFERENCE-TRAP              0B     2C     RETURN-CODE
-33     CC     SEQUENCE-3                  03     0C     SCODE-QUOTE
-34     D0     CONDITIONAL                 19     64     SEQUENCE-2
-35     D4     DISJUNCTION                 33     CC     SEQUENCE-3
-36     D8     CELL                        3B     EC     STACK-ENVIRONMENT
-37     DC     WEAK-CONS                   2D     B4     THE-ENVIRONMENT
-38     E0     QUAD                        08     20     TRUE
-39     E4     LINKAGE-SECTION             05     14     UNINTERNED-SYMBOL
+1D     74     INTERNED-SYMBOL             1D     74     INTERNED-SYMBOL
+1E     78     CHARACTER-STRING            17     5C     LAMBDA
+1F     7C     ACCESS                      29     A4     LEXPR
+20     80     HUNK3-A                     39     E4     LINKAGE-SECTION
+21     84     DEFINITION                  01     04     LIST
+22     88     BROKEN-HEART                0D     34     MANIFEST-CLOSURE
+23     8C     ASSIGNMENT                  27     9C     MANIFEST-NM-VECTOR
+24     90     HUNK3-B                     2B     AC     EPHEMERON
+25     94     UNUSED-25                          16     58     NON-MARKED-VECTOR
+26     98     COMBINATION                 00     00     NULL
+27     9C     MANIFEST-NM-VECTOR          30     C0     PCOMB0
+28     A0     COMPILED-ENTRY              1B     6C     PCOMB1
+29     A4     LEXPR                       04     10     PCOMB2
+2A     A8     PCOMB3                      2A     A8     PCOMB3
+2B     AC     EPHEMERON                   18     60     PRIMITIVE
+2C     B0     VARIABLE                    0F     3C     PROCEDURE
+2D     B4     THE-ENVIRONMENT             38     E0     QUAD
+2E     B8     FUTURE                      3A     E8     RATNUM
+2F     BC     VECTOR-1B                   3E     F8     RECORD
+30     C0     PCOMB0                      32     C8     REFERENCE-TRAP
+31     C4     VECTOR-16B                  0B     2C     RETURN-CODE
+32     C8     REFERENCE-TRAP              03     0C     SCODE-QUOTE
+33     CC     SEQUENCE-3                  19     64     SEQUENCE-2
+34     D0     CONDITIONAL                 33     CC     SEQUENCE-3
+35     D4     DISJUNCTION                 3B     EC     STACK-ENVIRONMENT
+36     D8     CELL                        2D     B4     THE-ENVIRONMENT
+37     DC     WEAK-CONS                   08     20     TRUE
+38     E0     QUAD                        05     14     UNINTERNED-SYMBOL
+39     E4     LINKAGE-SECTION             25     94     UNUSED-25
 3A     E8     RATNUM                      2C     B0     VARIABLE
 3B     EC     STACK-ENVIRONMENT           0A     28     VECTOR
 3C     F0     COMPLEX                     31     C4     VECTOR-16B
 3D     F4     COMPILED-CODE-BLOCK         2F     BC     VECTOR-1B
 3E     F8     RECORD                      37     DC     WEAK-CONS
+

diff --git a/src/microcode/types.h b/src/microcode/types.h
index 2205aad00641884c7e407d789212f33ba3f96f26..df4dc18fe534816e56b5aa17129a7b8fddfcef67 100644 (file)
--- a/src/microcode/types.h
+++ b/src/microcode/types.h
@@ -63,7 +63,7 @@ USA.
 #define TC_BROKEN_HEART                        0x22
 #define TC_ASSIGNMENT                  0x23
 #define TC_HUNK3_B                     0x24
-#define TC_IN_PACKAGE                  0x25
+/* #define TC_UNUSED_25                        0x25 */
 #define TC_COMBINATION                 0x26
 #define TC_MANIFEST_NM_VECTOR          0x27
 #define TC_COMPILED_ENTRY              0x28
@@ -141,7 +141,7 @@ USA.
   /* 0x22 */                   "broken-heart",                         \
   /* 0x23 */                   "assignment",                           \
   /* 0x24 */                   "triple",                               \
-  /* 0x25 */                   "in-package",                           \
+  /* 0x25 */                   0,                                      \
   /* 0x26 */                   "combination",                          \
   /* 0x27 */                   "manifest-nm-vector",                   \
   /* 0x28 */                   "compiled-entry",                       \