From: Matt Birkholz Date: Wed, 17 Apr 2013 15:42:50 +0000 (-0700) Subject: Remove all trace of type codes COMBINATION-2, PCOMB0, etc. X-Git-Tag: release-9.2.0~191 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=baf1cd59f49938c355687ef375b2516c9fd9bf21;p=mit-scheme.git Remove all trace of type codes COMBINATION-2, PCOMB0, etc. This finishes what 3fc580e started. The resulting system runs but does not build with the released version 9.1. That version puts old combinations in .exts that cannot be fasloaded by this new version. As the old combination types are no longer compilable nor even interpretable, it seems the build process loads them but does not use them. The following commit will put just the gc handlers back, which is sufficient to allow building directly from 9.1. --- diff --git a/src/microcode/boot.c b/src/microcode/boot.c index a3fbf501f..b24eadf93 100644 --- a/src/microcode/boot.c +++ b/src/microcode/boot.c @@ -160,11 +160,13 @@ start_scheme (void) SCHEME_OBJECT fn_object = (char_pointer_to_string (option_fasl_file)); SCHEME_OBJECT prim2 = (make_primitive ("SCODE-EVAL", 2)); SCHEME_OBJECT * inner_arg = Free; + (*Free++) = MAKE_OBJECT (TC_MANIFEST_VECTOR, 2); (*Free++) = prim1; (*Free++) = fn_object; - expr = (MAKE_POINTER_OBJECT (TC_PCOMB2, Free)); + expr = (MAKE_POINTER_OBJECT (TC_COMBINATION, Free)); + (*Free++) = MAKE_OBJECT (TC_MANIFEST_VECTOR, 3); (*Free++) = prim2; - (*Free++) = (MAKE_POINTER_OBJECT (TC_PCOMB1, inner_arg)); + (*Free++) = (MAKE_POINTER_OBJECT (TC_COMBINATION, inner_arg)); (*Free++) = THE_GLOBAL_ENV; } else @@ -172,7 +174,8 @@ start_scheme (void) /* (LOAD-BAND ) */ SCHEME_OBJECT prim = (make_primitive ("LOAD-BAND", 1)); SCHEME_OBJECT fn_object = (char_pointer_to_string (option_band_file)); - expr = (MAKE_POINTER_OBJECT (TC_PCOMB1, Free)); + expr = (MAKE_POINTER_OBJECT (TC_COMBINATION, Free)); + (*Free++) = MAKE_OBJECT (TC_MANIFEST_VECTOR, 2); (*Free++) = prim; (*Free++) = fn_object; } diff --git a/src/microcode/debug.c b/src/microcode/debug.c index df1de9595..d307ce0dc 100644 --- a/src/microcode/debug.c +++ b/src/microcode/debug.c @@ -431,32 +431,6 @@ do_printing (outf_channel stream, SCHEME_OBJECT Expr, bool Detailed) } return; - case TC_COMBINATION_1: - outf (stream, "[COMBINATION_1 0x%lx]", ((long) Temp_Address)); - if (Detailed) - { - outf (stream, " ("); - do_printing (stream, (MEMORY_REF (Expr, COMB_1_FN)), false); - outf (stream, ", "); - do_printing (stream, (MEMORY_REF (Expr, COMB_1_ARG_1)), false); - outf (stream, ")"); - } - return; - - case TC_COMBINATION_2: - outf (stream, "[COMBINATION_2 0x%lx]", ((long) Temp_Address)); - if (Detailed) - { - outf (stream, " ("); - do_printing (stream, (MEMORY_REF (Expr, COMB_2_FN)), false); - outf (stream, ", "); - do_printing (stream, (MEMORY_REF (Expr, COMB_2_ARG_1)), false); - outf (stream, ", "); - do_printing (stream, (MEMORY_REF (Expr, COMB_2_ARG_2)), false); - outf (stream, ")"); - } - return; - case TC_ENVIRONMENT: { SCHEME_OBJECT procedure; diff --git a/src/microcode/fasdump.c b/src/microcode/fasdump.c index 273b5d591..6be82c4c0 100644 --- a/src/microcode/fasdump.c +++ b/src/microcode/fasdump.c @@ -336,7 +336,6 @@ fasdump_table (void) (GCT_TRANSPORT_WORDS ((&table))) = fasdump_transport_words; (GCT_ENTRY ((&table), TC_PRIMITIVE)) = handle_primitive; - (GCT_ENTRY ((&table), TC_PCOMB0)) = handle_primitive; (GCT_ENTRY ((&table), TC_MANIFEST_CLOSURE)) = handle_manifest_closure; (GCT_ENTRY ((&table), TC_LINKAGE_SECTION)) = handle_linkage_section; (GCT_ENTRY ((&table), TC_INTERNED_SYMBOL)) = handle_symbol; @@ -548,10 +547,11 @@ When the file is reloaded, PROCEDURE is called with an argument of #F.") SCHEME_OBJECT comb; SCHEME_OBJECT root; - comb = (MAKE_POINTER_OBJECT (TC_COMBINATION_1, to)); - (to[COMB_1_FN]) = (ARG_REF (1)); - (to[COMB_1_ARG_1]) = SHARP_F; - to += 2; + comb = (MAKE_POINTER_OBJECT (TC_COMBINATION, to)); + (to[COMB_VECTOR_HEADER]) = MAKE_OBJECT(TC_MANIFEST_VECTOR, 2); + (to[COMB_FN_SLOT]) = (ARG_REF (1)); + (to[COMB_ARG_1_SLOT]) = SHARP_F; + to += 3; root = (MAKE_POINTER_OBJECT (TC_LIST, to)); (*to++) = comb; diff --git a/src/microcode/fasload.c b/src/microcode/fasload.c index e3f73d681..47778dcd3 100644 --- a/src/microcode/fasload.c +++ b/src/microcode/fasload.c @@ -496,7 +496,6 @@ relocate_block_table (void) (GCT_ENTRY ((&table), TC_WEAK_CONS)) = gc_handle_pair; (GCT_ENTRY ((&table), TC_EPHEMERON)) = gc_handle_unaligned_vector; (GCT_ENTRY ((&table), TC_PRIMITIVE)) = handle_primitive; - (GCT_ENTRY ((&table), TC_PCOMB0)) = handle_primitive; (GCT_ENTRY ((&table), TC_BROKEN_HEART)) = gc_handle_non_pointer; initialized_p = true; diff --git a/src/microcode/gcloop.c b/src/microcode/gcloop.c index 518e32508..557be8d24 100644 --- a/src/microcode/gcloop.c +++ b/src/microcode/gcloop.c @@ -1251,15 +1251,15 @@ gc_type_t gc_type_map [N_TYPE_CODES] = GC_PAIR, /* TC_LIST */ GC_NON_POINTER, /* TC_CHARACTER */ GC_PAIR, /* TC_SCODE_QUOTE */ - GC_TRIPLE, /* TC_PCOMB2 */ + GC_UNDEFINED, /* TC_PCOMB2 */ GC_PAIR, /* TC_UNINTERNED_SYMBOL */ GC_VECTOR, /* TC_BIG_FLONUM */ - GC_PAIR, /* TC_COMBINATION_1 */ + GC_UNDEFINED, /* TC_COMBINATION_1 */ GC_NON_POINTER, /* TC_CONSTANT */ GC_PAIR, /* TC_EXTENDED_PROCEDURE */ GC_VECTOR, /* TC_VECTOR */ GC_NON_POINTER, /* TC_RETURN_CODE */ - GC_TRIPLE, /* TC_COMBINATION_2 */ + GC_UNDEFINED, /* TC_COMBINATION_2 */ GC_SPECIAL, /* TC_MANIFEST_CLOSURE */ GC_VECTOR, /* TC_BIG_FIXNUM */ GC_PAIR, /* TC_PROCEDURE */ @@ -1274,7 +1274,7 @@ gc_type_t gc_type_map [N_TYPE_CODES] = GC_NON_POINTER, /* TC_PRIMITIVE */ GC_PAIR, /* TC_SEQUENCE */ GC_NON_POINTER, /* TC_FIXNUM */ - GC_PAIR, /* TC_PCOMB1 */ + GC_UNDEFINED, /* TC_PCOMB1 */ GC_VECTOR, /* TC_CONTROL_POINT */ GC_PAIR, /* TC_INTERNED_SYMBOL */ GC_VECTOR, /* TC_CHARACTER_STRING,TC_VECTOR_8B */ @@ -1289,13 +1289,13 @@ gc_type_t gc_type_map [N_TYPE_CODES] = GC_SPECIAL, /* TC_MANIFEST_NM_VECTOR */ GC_COMPILED, /* TC_COMPILED_ENTRY */ GC_PAIR, /* TC_LEXPR */ - GC_VECTOR, /* TC_PCOMB3 */ + GC_UNDEFINED, /* TC_PCOMB3 */ GC_VECTOR, /* TC_EPHEMERON */ GC_TRIPLE, /* TC_VARIABLE */ GC_NON_POINTER, /* TC_THE_ENVIRONMENT */ GC_PAIR, /* TC_SYNTAX_ERROR */ GC_VECTOR, /* TC_VECTOR_1B,TC_BIT_STRING */ - GC_NON_POINTER, /* TC_PCOMB0 */ + GC_UNDEFINED, /* TC_PCOMB0 */ GC_VECTOR, /* TC_VECTOR_16B */ GC_SPECIAL, /* TC_REFERENCE_TRAP */ GC_UNDEFINED, /* 0x33 */ diff --git a/src/microcode/interp.c b/src/microcode/interp.c index a8e5ddb60..e4f981f77 100644 --- a/src/microcode/interp.c +++ b/src/microcode/interp.c @@ -467,16 +467,6 @@ Interpret (int pop_return_p) DO_NTH_THEN (RC_COMB_SAVE_VALUE, (length + 1)); } - case TC_COMBINATION_1: - Will_Eventually_Push (CONTINUATION_SIZE + STACK_ENV_FIRST_ARG + 1); - PUSH_ENV (); - DO_NTH_THEN (RC_COMB_1_PROCEDURE, COMB_1_ARG_1); - - case TC_COMBINATION_2: - Will_Eventually_Push (CONTINUATION_SIZE + STACK_ENV_FIRST_ARG + 2); - PUSH_ENV (); - DO_NTH_THEN (RC_COMB_2_FIRST_OPERAND, COMB_2_ARG_2); - case TC_COMMENT: REDUCES_TO_NTH (COMMENT_EXPRESSION); @@ -529,28 +519,6 @@ Interpret (int pop_return_p) case TC_MANIFEST_NM_VECTOR: EVAL_ERROR (ERR_EXECUTE_MANIFEST_VECTOR); - case TC_PCOMB0: - /* The argument to Will_Eventually_Push is determined by how - much will be on the stack if we back out of the primitive. */ - Will_Eventually_Push (CONTINUATION_SIZE + STACK_ENV_FIRST_ARG); - Finished_Eventual_Pushing (CONTINUATION_SIZE + STACK_ENV_FIRST_ARG); - SET_EXP (OBJECT_NEW_TYPE (TC_PRIMITIVE, GET_EXP)); - goto primitive_internal_apply; - - case TC_PCOMB1: - Will_Eventually_Push (CONTINUATION_SIZE + STACK_ENV_FIRST_ARG + 1); - DO_NTH_THEN (RC_PCOMB1_APPLY, PCOMB1_ARG_SLOT); - - case TC_PCOMB2: - Will_Eventually_Push (CONTINUATION_SIZE + STACK_ENV_FIRST_ARG + 2); - PUSH_ENV (); - DO_NTH_THEN (RC_PCOMB2_DO_1, PCOMB2_ARG_2_SLOT); - - case TC_PCOMB3: - Will_Eventually_Push (CONTINUATION_SIZE + STACK_ENV_FIRST_ARG + 3); - PUSH_ENV (); - DO_NTH_THEN (RC_PCOMB3_DO_2, PCOMB3_ARG_3_SLOT); - case TC_SCODE_QUOTE: SET_VAL (MEMORY_REF (GET_EXP, SCODE_QUOTE_OBJECT)); break; @@ -627,27 +595,6 @@ Interpret (int pop_return_p) switch (OBJECT_DATUM (GET_RET)) { - case RC_COMB_1_PROCEDURE: - POP_ENV (); - PUSH_VAL (); /* Arg. 1 */ - STACK_PUSH (SHARP_F); /* Operator */ - PUSH_APPLY_FRAME_HEADER (1); - Finished_Eventual_Pushing (CONTINUATION_SIZE); - DO_ANOTHER_THEN (RC_COMB_APPLY_FUNCTION, COMB_1_FN); - - case RC_COMB_2_FIRST_OPERAND: - POP_ENV (); - PUSH_VAL (); - PUSH_ENV (); - DO_ANOTHER_THEN (RC_COMB_2_PROCEDURE, COMB_2_ARG_1); - - case RC_COMB_2_PROCEDURE: - POP_ENV (); - PUSH_VAL (); /* Arg 1, just calculated */ - STACK_PUSH (SHARP_F); /* Function */ - PUSH_APPLY_FRAME_HEADER (2); - Finished_Eventual_Pushing (CONTINUATION_SIZE); - DO_ANOTHER_THEN (RC_COMB_APPLY_FUNCTION, COMB_2_FN); case RC_COMB_APPLY_FUNCTION: END_SUBPROBLEM (); @@ -977,10 +924,7 @@ Interpret (int pop_return_p) goto pop_return; /* After checking the number of arguments, remove the - frame header since primitives do not expect it. - - NOTE: This code must match the application code which - follows primitive_internal_apply. */ + frame header since primitives do not expect it. */ case TC_PRIMITIVE: if (!IMPLEMENTED_PRIMITIVE_P (Function)) @@ -988,7 +932,6 @@ Interpret (int pop_return_p) { unsigned long n_args = (APPLY_FRAME_N_ARGS ()); - /* Note that the first test below will fail for lexpr primitives. */ @@ -1140,76 +1083,6 @@ Interpret (int pop_return_p) EXIT_CRITICAL_SECTION ({ SAVE_CONT (); }); break; - case RC_PCOMB1_APPLY: - END_SUBPROBLEM (); - PUSH_VAL (); /* Argument value */ - Finished_Eventual_Pushing (CONTINUATION_SIZE + STACK_ENV_FIRST_ARG); - SET_EXP (MEMORY_REF (GET_EXP, PCOMB1_FN_SLOT)); - - primitive_internal_apply: - -#ifdef COMPILE_STEPPER - if (trapping - && (!WITHIN_CRITICAL_SECTION_P ()) - && ((FETCH_APPLY_TRAPPER ()) != SHARP_F)) - { - Will_Push (3); - PUSH_EXP (); - STACK_PUSH (FETCH_APPLY_TRAPPER ()); - PUSH_APPLY_FRAME_HEADER (1 + (PRIMITIVE_N_PARAMETERS (GET_EXP))); - Pushed (); - trapping = false; - goto Apply_Non_Trapping; - } -#endif /* COMPILE_STEPPER */ - - /* NOTE: This code must match the code in the TC_PRIMITIVE - case of internal_apply. - This code is simpler because: - 1) The arity was checked at syntax time. - 2) We don't have to deal with "lexpr" primitives. - 3) We don't need to worry about unimplemented primitives because - unimplemented primitives will cause an error at invocation. */ - { - SCHEME_OBJECT primitive = GET_EXP; - APPLY_PRIMITIVE_FROM_INTERPRETER (primitive); - POP_PRIMITIVE_FRAME (PRIMITIVE_ARITY (primitive)); - break; - } - - case RC_PCOMB2_APPLY: - END_SUBPROBLEM (); - PUSH_VAL (); /* Value of arg. 1 */ - Finished_Eventual_Pushing (CONTINUATION_SIZE + STACK_ENV_FIRST_ARG); - SET_EXP (MEMORY_REF (GET_EXP, PCOMB2_FN_SLOT)); - goto primitive_internal_apply; - - case RC_PCOMB2_DO_1: - POP_ENV (); - PUSH_VAL (); /* Save value of arg. 2 */ - DO_ANOTHER_THEN (RC_PCOMB2_APPLY, PCOMB2_ARG_1_SLOT); - - case RC_PCOMB3_APPLY: - END_SUBPROBLEM (); - PUSH_VAL (); /* Save value of arg. 1 */ - Finished_Eventual_Pushing (CONTINUATION_SIZE + STACK_ENV_FIRST_ARG); - SET_EXP (MEMORY_REF (GET_EXP, PCOMB3_FN_SLOT)); - goto primitive_internal_apply; - - case RC_PCOMB3_DO_1: - { - SCHEME_OBJECT Temp = (STACK_POP ()); /* Value of arg. 3 */ - POP_ENV (); - STACK_PUSH (Temp); /* Save arg. 3 again */ - PUSH_VAL (); /* Save arg. 2 */ - DO_ANOTHER_THEN (RC_PCOMB3_APPLY, PCOMB3_ARG_1_SLOT); - } - - case RC_PCOMB3_DO_2: - SET_ENV (STACK_REF (0)); - PUSH_VAL (); /* Save value of arg. 3 */ - DO_ANOTHER_THEN (RC_PCOMB3_DO_1, PCOMB3_ARG_2_SLOT); - case RC_POP_RETURN_ERROR: case RC_RESTORE_VALUE: SET_VAL (GET_EXP); diff --git a/src/microcode/returns.h b/src/microcode/returns.h index 9f3a559df..668da657b 100644 --- a/src/microcode/returns.h +++ b/src/microcode/returns.h @@ -44,17 +44,17 @@ USA. /* unused 0x0E */ #define RC_CONDITIONAL_DECIDE 0x0F #define RC_DISJUNCTION_DECIDE 0x10 -#define RC_COMB_1_PROCEDURE 0x11 +/* #define RC_COMB_1_PROCEDURE 0x11 */ #define RC_COMB_APPLY_FUNCTION 0x12 -#define RC_COMB_2_FIRST_OPERAND 0x13 -#define RC_COMB_2_PROCEDURE 0x14 +/* #define RC_COMB_2_FIRST_OPERAND 0x13 */ +/*#define RC_COMB_2_PROCEDURE 0x14 */ #define RC_COMB_SAVE_VALUE 0x15 -#define RC_PCOMB1_APPLY 0x16 -#define RC_PCOMB2_DO_1 0x17 -#define RC_PCOMB2_APPLY 0x18 -#define RC_PCOMB3_DO_2 0x19 -#define RC_PCOMB3_DO_1 0x1A -#define RC_PCOMB3_APPLY 0x1B +/* #define RC_PCOMB1_APPLY 0x16 */ +/* #define RC_PCOMB2_DO_1 0x17 */ +/* #define RC_PCOMB2_APPLY 0x18 */ +/* #define RC_PCOMB3_DO_2 0x19 */ +/* #define RC_PCOMB3_DO_1 0x1A */ +/* #define RC_PCOMB3_APPLY 0x1B */ #define RC_SNAP_NEED_THUNK 0x1C #define RC_REENTER_COMPILED_CODE 0x1D /* unused 0x1E */ @@ -113,17 +113,17 @@ USA. /* 0x0e */ 0, \ /* 0x0f */ "conditional-decide", \ /* 0x10 */ "disjunction-decide", \ -/* 0x11 */ "combination-1-procedure", \ +/* 0x11 */ 0, \ /* 0x12 */ "combination-apply", \ -/* 0x13 */ "combination-2-first-operand", \ -/* 0x14 */ "combination-2-procedure", \ +/* 0x13 */ 0, \ +/* 0x14 */ 0, \ /* 0x15 */ "combination-save-value", \ -/* 0x16 */ "primitive-combination-1-apply", \ -/* 0x17 */ "primitive-combination-2-first-operand", \ -/* 0x18 */ "primitive-combination-2-apply", \ -/* 0x19 */ "primitive-combination-3-second-operand", \ -/* 0x1a */ "primitive-combination-3-first-operand", \ -/* 0x1b */ "primitive-combination-3-apply", \ +/* 0x16 */ 0, \ +/* 0x17 */ 0, \ +/* 0x18 */ 0, \ +/* 0x19 */ 0, \ +/* 0x1a */ 0, \ +/* 0x1b */ 0, \ /* 0x1c */ "force-snap-thunk", \ /* 0x1d */ "reenter-compiled-code", \ /* 0x1e */ 0, \ diff --git a/src/microcode/scode.h b/src/microcode/scode.h index 13e77c1d1..047a7ce28 100644 --- a/src/microcode/scode.h +++ b/src/microcode/scode.h @@ -47,21 +47,11 @@ USA. #define ASSIGN_NAME 0 #define ASSIGN_VALUE 1 -/* COMBINATIONS come in several formats */ - -/* General combinations are vector-like: */ +/* COMBINATIONS are vector-like: */ #define COMB_VECTOR_HEADER 0 #define COMB_FN_SLOT 1 #define COMB_ARG_1_SLOT 2 -/* Short non-primitive combinations: */ -#define COMB_1_FN 0 -#define COMB_1_ARG_1 1 - -#define COMB_2_FN 0 -#define COMB_2_ARG_1 1 -#define COMB_2_ARG_2 2 - /* COMMENT operation: */ #define COMMENT_EXPRESSION 0 #define COMMENT_TEXT 1 @@ -146,23 +136,6 @@ USA. * beyond those indicated in the LAMBDA_FORMALS list. */ -/* Primitive combinations with 0 arguments are not pointers */ - -/* Primitive combinations, 1 argument: */ -#define PCOMB1_FN_SLOT 0 -#define PCOMB1_ARG_SLOT 1 - -/* Primitive combinations, 2 arguments: */ -#define PCOMB2_FN_SLOT 0 -#define PCOMB2_ARG_1_SLOT 1 -#define PCOMB2_ARG_2_SLOT 2 - -/* Primitive combinations, 3 arguments are vector-like: */ -#define PCOMB3_FN_SLOT 1 -#define PCOMB3_ARG_1_SLOT 2 -#define PCOMB3_ARG_2_SLOT 3 -#define PCOMB3_ARG_3_SLOT 4 - /* SCODE_QUOTE returns itself */ #define SCODE_QUOTE_OBJECT 0 #define SCODE_QUOTE_IGNORED 1 diff --git a/src/microcode/typename.txt b/src/microcode/typename.txt index 4d10ae8fa..a2922069d 100644 --- a/src/microcode/typename.txt +++ b/src/microcode/typename.txt @@ -6,15 +6,15 @@ 01 04 LIST 23 8C ASSIGNMENT 02 08 CHARACTER 0E 38 BIG-FIXNUM 03 0C SCODE-QUOTE 06 18 BIG-FLONUM -04 10 PCOMB2 22 88 BROKEN-HEART +04 10 UNUSED-04 22 88 BROKEN-HEART 05 14 UNINTERNED-SYMBOL 36 D8 CELL 06 18 BIG-FLONUM 02 08 CHARACTER -07 1C COMBINATION-1 1E 78 CHARACTER-STRING +07 1C UNUSED-07 1E 78 CHARACTER-STRING 08 20 TRUE 26 98 COMBINATION -09 24 EXTENDED-PROCEDURE 07 1C COMBINATION-1 -0A 28 VECTOR 0C 30 COMBINATION-2 +09 24 EXTENDED-PROCEDURE 07 1C UNUSED-07 +0A 28 VECTOR 0C 30 UNUSED-0C 0B 2C RETURN-CODE 15 54 COMMENT -0C 30 COMBINATION-2 3D F4 COMPILED-CODE-BLOCK +0C 30 UNUSED-0C 3D F4 COMPILED-CODE-BLOCK 0D 34 MANIFEST-CLOSURE 28 A0 COMPILED-ENTRY 0E 38 BIG-FIXNUM 3C F0 COMPLEX 0F 3C PROCEDURE 34 D0 CONDITIONAL @@ -29,7 +29,7 @@ 18 60 PRIMITIVE 09 24 EXTENDED-PROCEDURE 19 64 SEQUENCE 1A 68 FIXNUM 1A 68 FIXNUM 2E B8 FUTURE -1B 6C PCOMB1 20 80 HUNK3-A +1B 6C UNUSED-1B 20 80 HUNK3-A 1C 70 CONTROL-POINT 24 90 HUNK3-B 1D 74 INTERNED-SYMBOL 1D 74 INTERNED-SYMBOL 1E 78 CHARACTER-STRING 17 5C LAMBDA @@ -41,16 +41,16 @@ 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 +27 9C MANIFEST-NM-VECTOR 30 C0 UNUSED-30 +28 A0 COMPILED-ENTRY 1B 6C UNUSED-1B +29 A4 LEXPR 04 10 UNUSED-04 +2A A8 UNUSED-2A 2A A8 UNUSED-2A 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 +30 C0 UNUSED-30 32 C8 REFERENCE-TRAP 31 C4 VECTOR-16B 0B 2C RETURN-CODE 32 C8 REFERENCE-TRAP 03 0C SCODE-QUOTE 33 CC UNUSED-33 19 64 SEQUENCE diff --git a/src/microcode/types.h b/src/microcode/types.h index b909ea493..f56baeb61 100644 --- a/src/microcode/types.h +++ b/src/microcode/types.h @@ -30,15 +30,15 @@ USA. #define TC_LIST 0x01 #define TC_CHARACTER 0x02 #define TC_SCODE_QUOTE 0x03 -#define TC_PCOMB2 0x04 +/* #define TC_PCOMB2 0x04 */ #define TC_UNINTERNED_SYMBOL 0x05 #define TC_BIG_FLONUM 0x06 -#define TC_COMBINATION_1 0x07 +/* #define TC_COMBINATION_1 0x07 */ #define TC_CONSTANT 0x08 #define TC_EXTENDED_PROCEDURE 0x09 #define TC_VECTOR 0x0A #define TC_RETURN_CODE 0x0B -#define TC_COMBINATION_2 0x0C +/* #define TC_COMBINATION_2 0x0C */ #define TC_MANIFEST_CLOSURE 0x0D #define TC_BIG_FIXNUM 0x0E #define TC_PROCEDURE 0x0F @@ -53,7 +53,7 @@ USA. #define TC_PRIMITIVE 0x18 #define TC_SEQUENCE 0x19 #define TC_FIXNUM 0x1A -#define TC_PCOMB1 0x1B +/* #define TC_PCOMB1 0x1B */ #define TC_CONTROL_POINT 0x1C #define TC_INTERNED_SYMBOL 0x1D #define TC_CHARACTER_STRING 0x1E @@ -68,13 +68,13 @@ USA. #define TC_MANIFEST_NM_VECTOR 0x27 #define TC_COMPILED_ENTRY 0x28 #define TC_LEXPR 0x29 -#define TC_PCOMB3 0x2A +/* #define TC_PCOMB3 0x2A */ #define TC_EPHEMERON 0x2B #define TC_VARIABLE 0x2C #define TC_THE_ENVIRONMENT 0x2D #define TC_SYNTAX_ERROR 0x2E #define TC_VECTOR_1B 0x2F -#define TC_PCOMB0 0x30 +/* #define TC_PCOMB0 0x30 */ #define TC_VECTOR_16B 0x31 #define TC_REFERENCE_TRAP 0x32 /* #define TC_UNUSED_33 0x33 */ @@ -108,15 +108,15 @@ USA. /* 0x01 */ "pair", \ /* 0x02 */ "character", \ /* 0x03 */ "quotation", \ - /* 0x04 */ "primitive-combination-2", \ + /* 0x04 */ 0, \ /* 0x05 */ "uninterned-symbol", \ /* 0x06 */ "flonum", \ - /* 0x07 */ "combination-1", \ + /* 0x07 */ 0, \ /* 0x08 */ "constant", \ /* 0x09 */ "extended-procedure", \ /* 0x0A */ "vector", \ /* 0x0B */ "return-code", \ - /* 0x0C */ "combination-2", \ + /* 0x0C */ 0, \ /* 0x0D */ "manifest-closure", \ /* 0x0E */ "bignum", \ /* 0x0F */ "procedure", \ @@ -131,7 +131,7 @@ USA. /* 0x18 */ "primitive", \ /* 0x19 */ "sequence", \ /* 0x1A */ "fixnum", \ - /* 0x1B */ "primitive-combination-1", \ + /* 0x1B */ 0, \ /* 0x1C */ "control-point", \ /* 0x1D */ "interned-symbol", \ /* 0x1e */ "string", \ @@ -146,13 +146,13 @@ USA. /* 0x27 */ "manifest-nm-vector", \ /* 0x28 */ "compiled-entry", \ /* 0x29 */ "lexpr", \ - /* 0x2a */ "primitive-combination-3", \ + /* 0x2a */ 0, \ /* 0x2b */ "ephemeron", \ /* 0x2c */ "variable", \ /* 0x2d */ "the-environment", \ /* 0x2e */ "syntax-error", \ /* 0x2f */ "vector-1b", \ - /* 0x30 */ "primitive-combination-0", \ + /* 0x30 */ 0, \ /* 0x31 */ "vector-16b", \ /* 0x32 */ "reference-trap", \ /* 0x33 */ 0, \