From: Guillermo J. Rozas Date: Sun, 26 Nov 1989 17:38:57 +0000 (+0000) Subject: Clean up the mess with machine_word. X-Git-Tag: 20090517-FFI~11675 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=0b6da43874f08d402e52e9a71d4ab87c9fe0d47f;p=mit-scheme.git Clean up the mess with machine_word. --- diff --git a/v7/src/microcode/bchdmp.c b/v7/src/microcode/bchdmp.c index a3d4d54d2..1a423401c 100644 --- a/v7/src/microcode/bchdmp.c +++ b/v7/src/microcode/bchdmp.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/bchdmp.c,v 9.46 1989/10/28 15:37:50 jinx Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/bchdmp.c,v 9.47 1989/11/26 17:38:13 jinx Exp $ Copyright (c) 1987, 1988, 1989 Massachusetts Institute of Technology @@ -382,7 +382,7 @@ dumploop(Scan, To_ptr, To_Address_ptr) /* Operator linkage */ fast long count; - fast machine_word *word_ptr, *next_ptr; + fast char *word_ptr, *next_ptr; long overflow; count = (READ_OPERATOR_LINKAGE_COUNT (Temp)); @@ -395,11 +395,11 @@ dumploop(Scan, To_ptr, To_Address_ptr) word_ptr = next_ptr, next_ptr = (NEXT_LINKAGE_OPERATOR_ENTRY (word_ptr))) { - if (next_ptr > ((machine_word *) scan_buffer_top)) + if (next_ptr > ((char *) scan_buffer_top)) { extend_scan_buffer (((char *) next_ptr), To); fasdump_linked_operator (); - next_ptr = ((machine_word *) + next_ptr = ((char *) (end_scan_buffer_extension ((char *) next_ptr))); overflow -= GC_DISK_BUFFER_SIZE; } @@ -416,23 +416,22 @@ dumploop(Scan, To_ptr, To_Address_ptr) case TC_MANIFEST_CLOSURE: { fast long count; - fast machine_word *word_ptr; - machine_word *end_ptr; + fast char *word_ptr; + char *end_ptr; Scan += 1; /* Is there enough space to read the count? */ - if ((((machine_word *) Scan) + 2) > - ((machine_word *) scan_buffer_top)) + if ((((char *) Scan) + 2) > ((char *) scan_buffer_top)) { long dw; - machine_word *header_end; + char *header_end; - header_end = (((machine_word *) Scan) + 2); + header_end = (((char *) Scan) + 2); extend_scan_buffer (((char *) header_end), To); count = (MANIFEST_CLOSURE_COUNT (Scan)); word_ptr = (FIRST_MANIFEST_CLOSURE_ENTRY (Scan)); dw = (word_ptr - header_end); - header_end = ((machine_word *) + header_end = ((char *) (end_scan_buffer_extension ((char *) header_end))); word_ptr = (header_end + dw); Scan = ((SCHEME_OBJECT *) (header_end - 2)); @@ -442,15 +441,14 @@ dumploop(Scan, To_ptr, To_Address_ptr) count = (MANIFEST_CLOSURE_COUNT (Scan)); word_ptr = (FIRST_MANIFEST_CLOSURE_ENTRY (Scan)); } - end_ptr = ((machine_word *) (MANIFEST_CLOSURE_END (Scan, count))); + end_ptr = ((char *) (MANIFEST_CLOSURE_END (Scan, count))); for ( ; ((--count) >= 0); (word_ptr = (NEXT_MANIFEST_CLOSURE_ENTRY (word_ptr)))) { - if ((CLOSURE_ENTRY_END (word_ptr)) > - ((machine_word *) scan_buffer_top)) + if ((CLOSURE_ENTRY_END (word_ptr)) > ((char *) scan_buffer_top)) { - machine_word *entry_end; + char *entry_end; long de, dw; entry_end = (CLOSURE_ENTRY_END (word_ptr)); @@ -458,7 +456,7 @@ dumploop(Scan, To_ptr, To_Address_ptr) dw = (entry_end - word_ptr); extend_scan_buffer (((char *) entry_end), To); fasdump_manifest_closure (); - entry_end = ((machine_word *) + entry_end = ((char *) (end_scan_buffer_extension ((char *) entry_end))); word_ptr = (entry_end - dw); end_ptr = (entry_end + de); diff --git a/v7/src/microcode/bchgcl.c b/v7/src/microcode/bchgcl.c index 25c53e091..6ec20b1b0 100644 --- a/v7/src/microcode/bchgcl.c +++ b/v7/src/microcode/bchgcl.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/bchgcl.c,v 9.37 1989/10/28 15:37:58 jinx Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/bchgcl.c,v 9.38 1989/11/26 17:38:18 jinx Exp $ Copyright (c) 1987, 1988, 1989 Massachusetts Institute of Technology @@ -139,7 +139,7 @@ GCLoop(Scan, To_ptr, To_Address_ptr) /* Operator linkage */ fast long count; - fast machine_word *word_ptr, *next_ptr; + fast char *word_ptr, *next_ptr; long overflow; count = (READ_OPERATOR_LINKAGE_COUNT (Temp)); @@ -152,11 +152,11 @@ GCLoop(Scan, To_ptr, To_Address_ptr) word_ptr = next_ptr, next_ptr = (NEXT_LINKAGE_OPERATOR_ENTRY (word_ptr))) { - if (next_ptr > ((machine_word *) scan_buffer_top)) + if (next_ptr > ((char *) scan_buffer_top)) { extend_scan_buffer ((char *) next_ptr, To); relocate_linked_operator (true); - next_ptr = ((machine_word *) + next_ptr = ((char *) (end_scan_buffer_extension ((char *) next_ptr))); overflow -= GC_DISK_BUFFER_SIZE; } @@ -173,23 +173,22 @@ GCLoop(Scan, To_ptr, To_Address_ptr) case TC_MANIFEST_CLOSURE: { fast long count; - fast machine_word *word_ptr; - machine_word *end_ptr; + fast char *word_ptr; + char *end_ptr; Scan += 1; /* Is there enough space to read the count? */ - if ((((machine_word *) Scan) + 2) > - ((machine_word *) scan_buffer_top)) + if ((((char *) Scan) + 2) > ((char *) scan_buffer_top)) { long dw; - machine_word *header_end; + char *header_end; - header_end = (((machine_word *) Scan) + 2); + header_end = (((char *) Scan) + 2); extend_scan_buffer (((char *) header_end), To); count = (MANIFEST_CLOSURE_COUNT (Scan)); word_ptr = (FIRST_MANIFEST_CLOSURE_ENTRY (Scan)); dw = (word_ptr - header_end); - header_end = ((machine_word *) + header_end = ((char *) (end_scan_buffer_extension ((char *) header_end))); word_ptr = (header_end + dw); Scan = ((SCHEME_OBJECT *) (header_end - 2)); @@ -199,15 +198,14 @@ GCLoop(Scan, To_ptr, To_Address_ptr) count = (MANIFEST_CLOSURE_COUNT (Scan)); word_ptr = (FIRST_MANIFEST_CLOSURE_ENTRY (Scan)); } - end_ptr = ((machine_word *) (MANIFEST_CLOSURE_END (Scan, count))); + end_ptr = ((char *) (MANIFEST_CLOSURE_END (Scan, count))); for ( ; ((--count) >= 0); (word_ptr = (NEXT_MANIFEST_CLOSURE_ENTRY (word_ptr)))) { - if ((CLOSURE_ENTRY_END (word_ptr)) > - ((machine_word *) scan_buffer_top)) + if ((CLOSURE_ENTRY_END (word_ptr)) > ((char *) scan_buffer_top)) { - machine_word *entry_end; + char *entry_end; long de, dw; entry_end = (CLOSURE_ENTRY_END (word_ptr)); @@ -215,7 +213,7 @@ GCLoop(Scan, To_ptr, To_Address_ptr) dw = (entry_end - word_ptr); extend_scan_buffer (((char *) entry_end), To); relocate_manifest_closure(true); - entry_end = ((machine_word *) + entry_end = ((char *) (end_scan_buffer_extension ((char *) entry_end))); word_ptr = (entry_end - dw); end_ptr = (entry_end + de); diff --git a/v7/src/microcode/bchpur.c b/v7/src/microcode/bchpur.c index 3843d9553..488cd39c8 100644 --- a/v7/src/microcode/bchpur.c +++ b/v7/src/microcode/bchpur.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/bchpur.c,v 9.46 1989/10/28 15:38:01 jinx Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/bchpur.c,v 9.47 1989/11/26 17:38:22 jinx Exp $ Copyright (c) 1987, 1988, 1989 Massachusetts Institute of Technology @@ -183,7 +183,7 @@ purifyloop(Scan, To_ptr, To_Address_ptr, purify_mode) /* Operator linkage */ fast long count; - fast machine_word *word_ptr, *next_ptr; + fast char *word_ptr, *next_ptr; long overflow; count = (READ_OPERATOR_LINKAGE_COUNT (Temp)); @@ -196,11 +196,11 @@ purifyloop(Scan, To_ptr, To_Address_ptr, purify_mode) word_ptr = next_ptr, next_ptr = (NEXT_LINKAGE_OPERATOR_ENTRY (word_ptr))) { - if (next_ptr > ((machine_word *) scan_buffer_top)) + if (next_ptr > ((char *) scan_buffer_top)) { extend_scan_buffer (((char *) next_ptr), To); relocate_linked_operator (false); - next_ptr = ((machine_word *) + next_ptr = ((char *) (end_scan_buffer_extension ((char *) next_ptr))); overflow -= GC_DISK_BUFFER_SIZE; } @@ -226,23 +226,22 @@ purifyloop(Scan, To_ptr, To_Address_ptr, purify_mode) } { fast long count; - fast machine_word *word_ptr; - machine_word *end_ptr; + fast char *word_ptr; + char *end_ptr; Scan += 1; /* Is there enough space to read the count? */ - if ((((machine_word *) Scan) + 2) > - ((machine_word *) scan_buffer_top)) + if ((((char *) Scan) + 2) > ((char *) scan_buffer_top)) { long dw; - machine_word *header_end; + char *header_end; - header_end = (((machine_word *) Scan) + 2); + header_end = (((char *) Scan) + 2); extend_scan_buffer (((char *) header_end), To); count = (MANIFEST_CLOSURE_COUNT (Scan)); word_ptr = (FIRST_MANIFEST_CLOSURE_ENTRY (Scan)); dw = (word_ptr - header_end); - header_end = ((machine_word *) + header_end = ((char *) (end_scan_buffer_extension ((char *) header_end))); word_ptr = (header_end + dw); Scan = ((SCHEME_OBJECT *) (header_end - 2)); @@ -252,15 +251,14 @@ purifyloop(Scan, To_ptr, To_Address_ptr, purify_mode) count = (MANIFEST_CLOSURE_COUNT (Scan)); word_ptr = (FIRST_MANIFEST_CLOSURE_ENTRY (Scan)); } - end_ptr = ((machine_word *) (MANIFEST_CLOSURE_END (Scan, count))); + end_ptr = ((char *) (MANIFEST_CLOSURE_END (Scan, count))); for ( ; ((--count) >= 0); (word_ptr = (NEXT_MANIFEST_CLOSURE_ENTRY (word_ptr)))) { - if ((CLOSURE_ENTRY_END(word_ptr)) > - ((machine_word *) scan_buffer_top)) + if ((CLOSURE_ENTRY_END(word_ptr)) > ((char *) scan_buffer_top)) { - machine_word *entry_end; + char *entry_end; long de, dw; entry_end = (CLOSURE_ENTRY_END(word_ptr)); @@ -268,7 +266,7 @@ purifyloop(Scan, To_ptr, To_Address_ptr, purify_mode) dw = (entry_end - word_ptr); extend_scan_buffer(((char *) entry_end), To); relocate_manifest_closure (false); - entry_end = ((machine_word *) + entry_end = ((char *) (end_scan_buffer_extension((char *) entry_end))); word_ptr = (entry_end - dw); end_ptr = (entry_end + de); diff --git a/v7/src/microcode/fasdump.c b/v7/src/microcode/fasdump.c index 29b81cec7..b8cf0a0c7 100644 --- a/v7/src/microcode/fasdump.c +++ b/v7/src/microcode/fasdump.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/fasdump.c,v 9.44 1989/10/28 15:38:18 jinx Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/fasdump.c,v 9.45 1989/11/26 17:38:39 jinx Exp $ Copyright (c) 1987, 1988, 1989 Massachusetts Institute of Technology @@ -158,7 +158,7 @@ DumpLoop(Scan, Dump_Mode) case TC_MANIFEST_CLOSURE: { fast long count; - fast machine_word *word_ptr; + fast char *word_ptr; SCHEME_OBJECT *area_end; compiled_code_present_p = true; @@ -205,21 +205,21 @@ DumpLoop(Scan, Dump_Mode) else { fast long count; - fast machine_word *word_ptr; + fast char *word_ptr; SCHEME_OBJECT *end_scan; - count = READ_OPERATOR_LINKAGE_COUNT(Temp); - word_ptr = FIRST_OPERATOR_LINKAGE_ENTRY(Scan); - end_scan = END_OPERATOR_LINKAGE_AREA(Scan, count); + count = (READ_OPERATOR_LINKAGE_COUNT (Temp)); + word_ptr = (FIRST_OPERATOR_LINKAGE_ENTRY (Scan)); + end_scan = (END_OPERATOR_LINKAGE_AREA (Scan, count)); while(--count >= 0) { Scan = ((SCHEME_OBJECT *) (word_ptr)); - word_ptr = NEXT_LINKAGE_OPERATOR_ENTRY(word_ptr); - EXTRACT_OPERATOR_LINKAGE_ADDRESS(Temp, Scan); - Dump_Compiled_Entry(after_operator); + word_ptr = (NEXT_LINKAGE_OPERATOR_ENTRY (word_ptr)); + EXTRACT_OPERATOR_LINKAGE_ADDRESS (Temp, Scan); + Dump_Compiled_Entry (after_operator); after_operator: - STORE_OPERATOR_LINKAGE_ADDRESS(Temp, Scan); + STORE_OPERATOR_LINKAGE_ADDRESS (Temp, Scan); } Scan = end_scan; break; diff --git a/v7/src/microcode/fasload.c b/v7/src/microcode/fasload.c index 4dad59e04..0217d2e4d 100644 --- a/v7/src/microcode/fasload.c +++ b/v7/src/microcode/fasload.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/fasload.c,v 9.45 1989/11/11 19:13:01 jinx Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/fasload.c,v 9.46 1989/11/26 17:38:44 jinx Exp $ Copyright (c) 1987, 1988, 1989 Massachusetts Institute of Technology @@ -328,20 +328,20 @@ Relocate_Block(Scan, Stop_At) else { fast long count; - fast machine_word *word_ptr; + fast char *word_ptr; SCHEME_OBJECT *end_scan; - count = READ_OPERATOR_LINKAGE_COUNT(Temp); - word_ptr = FIRST_OPERATOR_LINKAGE_ENTRY(Scan); - end_scan = END_OPERATOR_LINKAGE_AREA(Scan, count); + count = (READ_OPERATOR_LINKAGE_COUNT (Temp)); + word_ptr = (FIRST_OPERATOR_LINKAGE_ENTRY (Scan)); + end_scan = (END_OPERATOR_LINKAGE_AREA (Scan, count)); while(--count >= 0) { Scan = ((SCHEME_OBJECT *) (word_ptr)); - word_ptr = NEXT_LINKAGE_OPERATOR_ENTRY(word_ptr); - EXTRACT_OPERATOR_LINKAGE_ADDRESS(address, Scan); + word_ptr = (NEXT_LINKAGE_OPERATOR_ENTRY (word_ptr)); + EXTRACT_OPERATOR_LINKAGE_ADDRESS (address, Scan); address = ((long) (Relocate(address))); - STORE_OPERATOR_LINKAGE_ADDRESS(address, Scan); + STORE_OPERATOR_LINKAGE_ADDRESS (address, Scan); } Scan = &end_scan[1]; break; @@ -351,7 +351,7 @@ Relocate_Block(Scan, Stop_At) case TC_MANIFEST_CLOSURE: { fast long count; - fast machine_word *word_ptr; + fast char *word_ptr; SCHEME_OBJECT *area_end; Scan += 1; diff --git a/v7/src/microcode/gcloop.c b/v7/src/microcode/gcloop.c index 603563979..24f0c75a7 100644 --- a/v7/src/microcode/gcloop.c +++ b/v7/src/microcode/gcloop.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/gcloop.c,v 9.32 1989/10/28 15:38:33 jinx Exp $ +/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/gcloop.c,v 9.33 1989/11/26 17:38:48 jinx Exp $ * * This file contains the code for the most primitive part * of garbage collection. @@ -137,23 +137,23 @@ GCLoop(Scan, To_Pointer) else { fast long count; - fast machine_word *word_ptr; + fast char *word_ptr; SCHEME_OBJECT *end_scan; - count = READ_OPERATOR_LINKAGE_COUNT(Temp); - word_ptr = FIRST_OPERATOR_LINKAGE_ENTRY(Scan); - end_scan = END_OPERATOR_LINKAGE_AREA(Scan, count); + count = (READ_OPERATOR_LINKAGE_COUNT (Temp)); + word_ptr = (FIRST_OPERATOR_LINKAGE_ENTRY (Scan)); + end_scan = (END_OPERATOR_LINKAGE_AREA (Scan, count)); while(--count >= 0) { Scan = ((SCHEME_OBJECT *) word_ptr); - word_ptr = NEXT_LINKAGE_OPERATOR_ENTRY(word_ptr); - EXTRACT_OPERATOR_LINKAGE_ADDRESS(Temp, Scan); + word_ptr = (NEXT_LINKAGE_OPERATOR_ENTRY (word_ptr)); + EXTRACT_OPERATOR_LINKAGE_ADDRESS (Temp, Scan); GC_Pointer(Setup_Internal(true, Transport_Compiled(), Compiled_BH(true, goto next_operator))); next_operator: - STORE_OPERATOR_LINKAGE_ADDRESS(Temp, Scan); + STORE_OPERATOR_LINKAGE_ADDRESS (Temp, Scan); } Scan = end_scan; break; @@ -163,7 +163,7 @@ GCLoop(Scan, To_Pointer) case TC_MANIFEST_CLOSURE: { fast long count; - fast machine_word *word_ptr; + fast char *word_ptr; SCHEME_OBJECT *area_end; Scan += 1; diff --git a/v7/src/microcode/purify.c b/v7/src/microcode/purify.c index 2d9269321..72b90e39b 100644 --- a/v7/src/microcode/purify.c +++ b/v7/src/microcode/purify.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/purify.c,v 9.41 1989/10/28 15:38:48 jinx Exp $ +/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/purify.c,v 9.42 1989/11/26 17:38:52 jinx Exp $ * * This file contains the code that copies objects into pure * and constant space. @@ -148,18 +148,18 @@ PurifyLoop(Scan, To_Pointer, GC_Mode) else { fast long count; - fast machine_word *word_ptr; + fast char *word_ptr; SCHEME_OBJECT *end_scan; - count = READ_OPERATOR_LINKAGE_COUNT(Temp); - word_ptr = FIRST_OPERATOR_LINKAGE_ENTRY(Scan); - end_scan = END_OPERATOR_LINKAGE_AREA(Scan, count); + count = (READ_OPERATOR_LINKAGE_COUNT (Temp)); + word_ptr = (FIRST_OPERATOR_LINKAGE_ENTRY (Scan)); + end_scan = (END_OPERATOR_LINKAGE_AREA (Scan, count)); while(--count >= 0) { Scan = ((SCHEME_OBJECT *) word_ptr); - word_ptr = NEXT_LINKAGE_OPERATOR_ENTRY(word_ptr); - EXTRACT_OPERATOR_LINKAGE_ADDRESS(Temp, Scan); + word_ptr = (NEXT_LINKAGE_OPERATOR_ENTRY (word_ptr)); + EXTRACT_OPERATOR_LINKAGE_ADDRESS (Temp, Scan); Purify_Pointer(Setup_Internal(false, Transport_Compiled(), Compiled_BH(false, @@ -175,7 +175,7 @@ PurifyLoop(Scan, To_Pointer, GC_Mode) case TC_MANIFEST_CLOSURE: { fast long count; - fast machine_word *word_ptr; + fast char *word_ptr; SCHEME_OBJECT *area_end; if (GC_Mode == PURE_COPY) diff --git a/v7/src/microcode/version.h b/v7/src/microcode/version.h index dacdf4704..0ceea451a 100644 --- a/v7/src/microcode/version.h +++ b/v7/src/microcode/version.h @@ -1,6 +1,6 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/version.h,v 11.10 1989/11/11 19:13:06 jinx Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/version.h,v 11.11 1989/11/26 17:38:57 jinx Exp $ Copyright (c) 1988, 1989 Massachusetts Institute of Technology @@ -46,7 +46,7 @@ MIT in each case. */ #define VERSION 11 #endif #ifndef SUBVERSION -#define SUBVERSION 10 +#define SUBVERSION 11 #endif #ifndef UCODE_TABLES_FILENAME diff --git a/v8/src/microcode/version.h b/v8/src/microcode/version.h index 14798f030..ce1e84fe9 100644 --- a/v8/src/microcode/version.h +++ b/v8/src/microcode/version.h @@ -1,6 +1,6 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/version.h,v 11.10 1989/11/11 19:13:06 jinx Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/version.h,v 11.11 1989/11/26 17:38:57 jinx Exp $ Copyright (c) 1988, 1989 Massachusetts Institute of Technology @@ -46,7 +46,7 @@ MIT in each case. */ #define VERSION 11 #endif #ifndef SUBVERSION -#define SUBVERSION 10 +#define SUBVERSION 11 #endif #ifndef UCODE_TABLES_FILENAME