From 2f63b8eb6a34d2278a19038743eac675085ffd4b Mon Sep 17 00:00:00 2001 From: "Guillermo J. Rozas" Date: Thu, 12 Mar 1987 14:52:23 +0000 Subject: [PATCH] Remove compatibility with older versions of fasl files. --- v7/src/microcode/bintopsb.c | 15 ++++++++++++--- v7/src/microcode/fasl.h | 14 ++++++++++---- v8/src/microcode/bintopsb.c | 15 ++++++++++++--- v8/src/microcode/fasl.h | 14 ++++++++++---- 4 files changed, 44 insertions(+), 14 deletions(-) diff --git a/v7/src/microcode/bintopsb.c b/v7/src/microcode/bintopsb.c index b55657873..74d2a2eb5 100644 --- a/v7/src/microcode/bintopsb.c +++ b/v7/src/microcode/bintopsb.c @@ -30,7 +30,7 @@ Technology nor of any adaptation thereof in any advertising, promotional, or sales literature without prior written consent from MIT in each case. */ -/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/bintopsb.c,v 9.21 1987/01/22 14:10:46 jinx Exp $ +/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/bintopsb.c,v 9.22 1987/03/12 14:52:23 jinx Exp $ * * This File contains the code to translate internal format binary * files to portable format. @@ -401,6 +401,8 @@ break #define Do_Area(Code, Area, Bound, Obj, FObj) \ Process_Area(Code, &Area, &Bound, &Obj, &FObj) +#if 0 + #ifdef DEBUG #define Show_Upgrade(This, New_Type) \ fprintf(stderr, "Upgrading from 0x%02x|%06x to 0x%x\n", \ @@ -419,6 +421,8 @@ break break; \ } +#endif 0 + Process_Area(Code, Area, Bound, Obj, FObj) int Code; fast long *Area, *Bound; @@ -504,6 +508,8 @@ fast Pointer **FObj; case_simple_Vector: Do_Pointer(*Area, Do_Vector); +#if 0 + /* This should be cleaned up: We can no longer do it like this since we have reused the types. */ @@ -546,6 +552,7 @@ fast Pointer **FObj; Upgrade(TC_PCOMB3); case OLD_TC_PCOMB2: Upgrade(TC_PCOMB2); +#endif 0 default: Bad_Type: @@ -614,7 +621,7 @@ char *message; #define print_header(name, obj, format) \ fprintf(Portable_File, (format), (obj)); \ -fprintf(stderr, "%s: ", (name)); \ +fprintf(stderr, "%s: ", (name)); \ fprintf(stderr, (format), (obj)) #else @@ -672,7 +679,7 @@ do_it() } { long Size = ((3 * (Heap_Count + Const_Count)) + NROOTS + 1); -#ifdef FLOATING_ALIGNMENT +#if 0 Size += (FLOATING_ALIGNMENT+1)/sizeof(Pointer); #endif Allocate_Heap_Space(Size); @@ -683,7 +690,9 @@ do_it() exit(1); } } +#if 0 Align_Float(Heap); +#endif Load_Data(Heap_Count, &Heap[0]); Load_Data(Const_Count, &Heap[Heap_Count]); Heap_Relocation = &Heap[0] - Get_Pointer(Heap_Base); diff --git a/v7/src/microcode/fasl.h b/v7/src/microcode/fasl.h index f67ef3201..3da723b65 100644 --- a/v7/src/microcode/fasl.h +++ b/v7/src/microcode/fasl.h @@ -30,7 +30,7 @@ Technology nor of any adaptation thereof in any advertising, promotional, or sales literature without prior written consent from MIT in each case. */ -/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/fasl.h,v 9.21 1987/01/22 14:24:10 jinx Exp $ +/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/fasl.h,v 9.22 1987/03/12 14:51:36 jinx Exp $ Contains information relating to the format of FASL files. Some information is contained in CONFIG.H. @@ -75,15 +75,19 @@ MIT in each case. */ #define OPEN_FLAG "r" /* "Memorable" FASL sub-versions -- ones where we modified something - and want to remain backwards compatible + and want to remain backwards compatible. */ -#define FASL_OLDEST_SUPPORTED 2 #define FASL_LONG_HEADER 3 #define FASL_DENSE_TYPES 4 #define FASL_PADDED_STRINGS 5 +#define FASL_OLDEST_SUPPORTED 5 -/* Old Type Codes -- used for conversion purposes */ +#if 0 +/* Old Type Codes -- used for conversion purposes + This is no longer possible, because some were re-used + without changing the fasl file version. +*/ #define OLD_TC_CHARACTER 0x40 #define OLD_TC_PCOMB2 0x44 @@ -105,3 +109,5 @@ MIT in each case. */ #define OLD_TC_VECTOR_16B 0x7E #define OLD_TC_UNASSIGNED 0x38 #define OLD_TC_SEQUENCE_3 0x3C + +#endif 0 diff --git a/v8/src/microcode/bintopsb.c b/v8/src/microcode/bintopsb.c index 11cbcba0a..c413d0e97 100644 --- a/v8/src/microcode/bintopsb.c +++ b/v8/src/microcode/bintopsb.c @@ -30,7 +30,7 @@ Technology nor of any adaptation thereof in any advertising, promotional, or sales literature without prior written consent from MIT in each case. */ -/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/bintopsb.c,v 9.21 1987/01/22 14:10:46 jinx Exp $ +/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/bintopsb.c,v 9.22 1987/03/12 14:52:23 jinx Exp $ * * This File contains the code to translate internal format binary * files to portable format. @@ -401,6 +401,8 @@ break #define Do_Area(Code, Area, Bound, Obj, FObj) \ Process_Area(Code, &Area, &Bound, &Obj, &FObj) +#if 0 + #ifdef DEBUG #define Show_Upgrade(This, New_Type) \ fprintf(stderr, "Upgrading from 0x%02x|%06x to 0x%x\n", \ @@ -419,6 +421,8 @@ break break; \ } +#endif 0 + Process_Area(Code, Area, Bound, Obj, FObj) int Code; fast long *Area, *Bound; @@ -504,6 +508,8 @@ fast Pointer **FObj; case_simple_Vector: Do_Pointer(*Area, Do_Vector); +#if 0 + /* This should be cleaned up: We can no longer do it like this since we have reused the types. */ @@ -546,6 +552,7 @@ fast Pointer **FObj; Upgrade(TC_PCOMB3); case OLD_TC_PCOMB2: Upgrade(TC_PCOMB2); +#endif 0 default: Bad_Type: @@ -614,7 +621,7 @@ char *message; #define print_header(name, obj, format) \ fprintf(Portable_File, (format), (obj)); \ -fprintf(stderr, "%s: ", (name)); \ +fprintf(stderr, "%s: ", (name)); \ fprintf(stderr, (format), (obj)) #else @@ -672,7 +679,7 @@ do_it() } { long Size = ((3 * (Heap_Count + Const_Count)) + NROOTS + 1); -#ifdef FLOATING_ALIGNMENT +#if 0 Size += (FLOATING_ALIGNMENT+1)/sizeof(Pointer); #endif Allocate_Heap_Space(Size); @@ -683,7 +690,9 @@ do_it() exit(1); } } +#if 0 Align_Float(Heap); +#endif Load_Data(Heap_Count, &Heap[0]); Load_Data(Const_Count, &Heap[Heap_Count]); Heap_Relocation = &Heap[0] - Get_Pointer(Heap_Base); diff --git a/v8/src/microcode/fasl.h b/v8/src/microcode/fasl.h index cda475ede..62019c3fc 100644 --- a/v8/src/microcode/fasl.h +++ b/v8/src/microcode/fasl.h @@ -30,7 +30,7 @@ Technology nor of any adaptation thereof in any advertising, promotional, or sales literature without prior written consent from MIT in each case. */ -/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/fasl.h,v 9.21 1987/01/22 14:24:10 jinx Exp $ +/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/fasl.h,v 9.22 1987/03/12 14:51:36 jinx Exp $ Contains information relating to the format of FASL files. Some information is contained in CONFIG.H. @@ -75,15 +75,19 @@ MIT in each case. */ #define OPEN_FLAG "r" /* "Memorable" FASL sub-versions -- ones where we modified something - and want to remain backwards compatible + and want to remain backwards compatible. */ -#define FASL_OLDEST_SUPPORTED 2 #define FASL_LONG_HEADER 3 #define FASL_DENSE_TYPES 4 #define FASL_PADDED_STRINGS 5 +#define FASL_OLDEST_SUPPORTED 5 -/* Old Type Codes -- used for conversion purposes */ +#if 0 +/* Old Type Codes -- used for conversion purposes + This is no longer possible, because some were re-used + without changing the fasl file version. +*/ #define OLD_TC_CHARACTER 0x40 #define OLD_TC_PCOMB2 0x44 @@ -105,3 +109,5 @@ MIT in each case. */ #define OLD_TC_VECTOR_16B 0x7E #define OLD_TC_UNASSIGNED 0x38 #define OLD_TC_SEQUENCE_3 0x3C + +#endif 0 -- 2.25.1