Eliminate unnecessary usage of microcode version number.

diff --git a/v7/src/runtime/conpar.scm b/v7/src/runtime/conpar.scm
index de4657309021f2dd7c87cc9ff5c719c0d7c91dd9..2d250bc86a0ddeeb8d2db51b9bf79b575bfcfc98 100644 (file)
--- a/v7/src/runtime/conpar.scm
+++ b/v7/src/runtime/conpar.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: conpar.scm,v 14.41 2003/02/14 18:28:32 cph Exp $
+$Id: conpar.scm,v 14.42 2003/07/22 02:12:52 cph Exp $
 
 Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology
 
@@ -556,18 +556,16 @@ USA.
                 5
                 (fix:+ 5 fsize))))
          ((fix:= code code/interrupt-restart)
-          (if (fix:= 12 microcode-id/version)
-              4
-              (let ((homes-saved (object-datum (element-stream/ref stream 2)))
-                    (regs-saved (object-datum (element-stream/ref stream 3))))
-                ;; The first reg saved is _always_ the continuation,
-                ;; part of the next frame.
-                (fix:- (fix:+
-                        ;; Return code, reflect code, homes saved, regs saved,
-                        ;; and entry point
-                        5
-                        (fix:+ homes-saved regs-saved))
-                       1))))
+          (let ((homes-saved (object-datum (element-stream/ref stream 2)))
+                (regs-saved (object-datum (element-stream/ref stream 3))))
+            ;; The first reg saved is _always_ the continuation,
+            ;; part of the next frame.
+            (fix:- (fix:+
+                    ;; Return code, reflect code, homes saved, regs saved,
+                    ;; and entry point
+                    5
+                    (fix:+ homes-saved regs-saved))
+                   1)))
          ((fix:= code code/restore-regs)
           (fix:+ 3 (object-datum (element-stream/ref stream 2))))
          ((fix:= code code/apply-compiled)

diff --git a/v7/src/runtime/generic.scm b/v7/src/runtime/generic.scm
index 2db120cef987bb0d904ff2e50fd91ae6323a3245..97c892d94541413c377ed535327df595ce49656d 100644 (file)
--- a/v7/src/runtime/generic.scm
+++ b/v7/src/runtime/generic.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: generic.scm,v 1.6 2003/03/10 20:53:34 cph Exp $
+$Id: generic.scm,v 1.7 2003/07/22 02:12:56 cph Exp $
 
 Copyright 1996,2003 Massachusetts Institute of Technology
 
@@ -389,7 +389,7 @@ USA.
             ((2) expression-tag)
             (else default-tag))))))
     (let ((boolean-tag (make-built-in-tag 'BOOLEAN)))
-      (if (> microcode-id/version 11)
+      (if (fix:= (object-type #f) (object-type #t))
          (assign-type 'CONSTANT
                       (lambda (default-tag)
                         (lambda (object)