Merged 7.4 and 8.0 udata.scm files.

(Main benefit is the much faster compiled version of FORCE).

Removed FORCE from integrated primitives.

Added COMPILED-CODE-BLOCK/MARKED-START which returns the index that
COMPILED-CODE-BLOCK/CONSTANTS-START used to.
COMPILED-CODE-BLOCK/CONSTANTS-START now parses over the linkage
section.

Changed i386 disassembler to use COMPILED-CODE-BLOCK/MARKED-START.

diff --git a/v7/src/compiler/machines/i386/dassm1.scm b/v7/src/compiler/machines/i386/dassm1.scm
index 918c7f52f0a5dbed841c3e0b083f180a3a7f73ac..04023734c5ff063c49c1ba1010c03bdc66eeea0f 100644 (file)
--- a/v7/src/compiler/machines/i386/dassm1.scm
+++ b/v7/src/compiler/machines/i386/dassm1.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: dassm1.scm,v 1.6 1993/07/07 20:44:44 gjr Exp $
+$Id: dassm1.scm,v 1.7 1997/07/15 16:05:24 adams Exp $
 
 Copyright (c) 1992-1993 Massachusetts Institute of Technology
 
@@ -147,7 +147,7 @@ MIT in each case. |#
 (define (disassembler/write-constants-block block symbol-table)
   (fluid-let ((*unparser-radix* 16))
     (let ((end (system-vector-length block)))
-      (let loop ((index (compiled-code-block/constants-start block)))
+      (let loop ((index (compiled-code-block/marked-start block)))
        (cond ((not (< index end)) 'DONE)
              ((object-type?
                (let-syntax ((ucode-type

diff --git a/v7/src/sf/gconst.scm b/v7/src/sf/gconst.scm
index 5e5a295fa9f88d2ec8766dffda12333a14fa446a..e9569d058fcbaf39f5f3bcf2e9a0c2b27792fec5 100644 (file)
--- a/v7/src/sf/gconst.scm
+++ b/v7/src/sf/gconst.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: gconst.scm,v 4.20 1997/07/15 00:49:27 adams Exp $
+$Id: gconst.scm,v 4.21 1997/07/15 16:05:10 adams Exp $
 
 Copyright (c) 1987-1994 Massachusetts Institute of Technology
 
@@ -145,7 +145,6 @@ MIT in each case. |#
     FLO:VECTOR-REF
     FLO:VECTOR-SET!
     FLO:ZERO?
-    FORCE
     GENERAL-CAR-CDR
     GET-FIXED-OBJECTS-VECTOR
     GET-NEXT-CONSTANT