Eliminate references to MANIFEST-SPECIAL-NM-VECTOR. This type is

about to go away, and these references aren't normally needed.

diff --git a/v7/src/compiler/base/utils.scm b/v7/src/compiler/base/utils.scm
index 6e70c93831d59ea5bcac852e8bddf1eaf207522c..e46fc599b1b33d08d444ddda3764eb48d46264d5 100644 (file)
--- a/v7/src/compiler/base/utils.scm
+++ b/v7/src/compiler/base/utils.scm
@@ -1,9 +1,9 @@
 #| -*-Scheme-*-
 
-$Id: utils.scm,v 4.29 2004/08/15 04:54:45 cph Exp $
+$Id: utils.scm,v 4.30 2006/09/08 14:38:45 cph Exp $
 
 Copyright 1986,1987,1988,1989,1990,1992 Massachusetts Institute of Technology
-Copyright 1994,2001,2001,2003,2004 Massachusetts Institute of Technology
+Copyright 1994,2001,2001,2003,2004,2006 Massachusetts Institute of Technology
 
 This file is part of MIT/GNU Scheme.
 
@@ -195,8 +195,7 @@ USA.
       (object-type? (ucode-type character) object)
       (object-type? (ucode-type unassigned) object)
       (object-type? (ucode-type the-environment) object)
-      (object-type? (ucode-type manifest-nm-vector) object)
-      (object-type? (ucode-type manifest-special-nm-vector) object)))
+      (object-type? (ucode-type manifest-nm-vector) object)))
 
 (define (object-immutable? object)
   (or (non-pointer-object? object)

diff --git a/v7/src/runtime/global.scm b/v7/src/runtime/global.scm
index cadfc975fd54d4835d89eda3a830832ad0fb0416..368a24114a804255a59a1e62ee2fd1cd3c7828c5 100644 (file)
--- a/v7/src/runtime/global.scm
+++ b/v7/src/runtime/global.scm
@@ -1,9 +1,9 @@
 #| -*-Scheme-*-
 
-$Id: global.scm,v 14.72 2004/11/19 07:14:30 cph Exp $
+$Id: global.scm,v 14.73 2006/09/08 14:39:12 cph Exp $
 
 Copyright 1988,1989,1991,1992,1993,1995 Massachusetts Institute of Technology
-Copyright 1998,2000,2001,2003,2004 Massachusetts Institute of Technology
+Copyright 1998,2000,2001,2003,2004,2006 Massachusetts Institute of Technology
 
 This file is part of MIT/GNU Scheme.
 
@@ -281,7 +281,6 @@ USA.
     ((NON-POINTER) #t)
     ((GC-INTERNAL)
      (or (object-type? (ucode-type manifest-nm-vector) object)
-        (object-type? (ucode-type manifest-special-nm-vector) object)
         (and (object-type? (ucode-type reference-trap) object)
              (<= (object-datum object) trap-max-immediate))))
     (else #f)))
@@ -298,9 +297,7 @@ USA.
 (define (non-pointer-type-code? code)
   (case (type-code->gc-type code)
     ((NON-POINTER) #t)
-    ((GC-INTERNAL)
-     (or (fix:= (ucode-type manifest-nm-vector) code)
-        (fix:= (ucode-type manifest-special-nm-vector) code)))
+    ((GC-INTERNAL) (fix:= (ucode-type manifest-nm-vector) code))
     (else #f)))
 
 (define (pointer-type-code? code)

diff --git a/v7/src/runtime/hash.scm b/v7/src/runtime/hash.scm
index 9a8f23fa9a22d3468d36ff69614ccf15cab38435..020b1cdc063f8f39f4ff07dcf8337a57c6a77d29 100644 (file)
--- a/v7/src/runtime/hash.scm
+++ b/v7/src/runtime/hash.scm
@@ -1,9 +1,9 @@
 #| -*-Scheme-*-
 
-$Id: hash.scm,v 14.9 2004/10/01 17:04:58 cph Exp $
+$Id: hash.scm,v 14.10 2006/09/08 14:39:19 cph Exp $
 
 Copyright 1986,1987,1988,1989,1991,1993 Massachusetts Institute of Technology
-Copyright 2004 Massachusetts Institute of Technology
+Copyright 2004,2006 Massachusetts Institute of Technology
 
 This file is part of MIT/GNU Scheme.
 
@@ -55,7 +55,7 @@ USA.
 ;;; In order to make the hash and unhash tables weakly hold the
 ;;; objects hashed, the following mechanism is used:
 
-;;; The hash table, a vector, has a SNMV header before all the
+;;; The hash table, a vector, has a NMV header before all the
 ;;; buckets, and therefore the garbage collector will skip it and will
 ;;; not relocate its buckets.  It becomes invalid after a garbage
 ;;; collection and the first thing the daemon does is clear it.  Each
@@ -107,7 +107,7 @@ USA.
             (vector-set! table
                          0
                          ((ucode-primitive primitive-object-set-type)
-                          (ucode-type manifest-special-nm-vector)
+                          (ucode-type manifest-nm-vector)
                           (make-non-pointer-object size)))
             ((ucode-primitive primitive-object-set-type)
              (ucode-type non-marked-vector)

diff --git a/v7/src/runtime/unpars.scm b/v7/src/runtime/unpars.scm
index e83675cae945a43af4b1be16ccf0c77cd422b33e..75e5990099259deebea8b026b1fb0cf7432cd08c 100644 (file)
--- a/v7/src/runtime/unpars.scm
+++ b/v7/src/runtime/unpars.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: unpars.scm,v 14.65 2006/03/02 20:53:02 cph Exp $
+$Id: unpars.scm,v 14.66 2006/09/08 14:39:25 cph Exp $
 
 Copyright 1986,1987,1990,1991,1992,1995 Massachusetts Institute of Technology
 Copyright 1996,2001,2002,2003,2004,2005 Massachusetts Institute of Technology
@@ -474,10 +474,8 @@ USA.
 (define (safe-vector-ref vector index)
   (if (with-absolutely-no-interrupts
        (lambda ()
-        (or (object-type? (ucode-type manifest-nm-vector)
-                          (vector-ref vector index))
-            (object-type? (ucode-type manifest-special-nm-vector)
-                          (vector-ref vector index)))))
+        (object-type? (ucode-type manifest-nm-vector)
+                      (vector-ref vector index))))
       (error "Attempt to unparse partially marked vector."))
   (map-reference-trap (lambda () (vector-ref vector index))))