Implement and use new variable MICROCODE-ID/OPERATING-SYSTEM.

diff --git a/v7/src/runtime/dosprm.scm b/v7/src/runtime/dosprm.scm
index 84b39c8ff36243f3287da98e1b89d3078f7e0f19..ab70332b8c9e890cbcd5fa61609ff513130431c9 100644 (file)
--- a/v7/src/runtime/dosprm.scm
+++ b/v7/src/runtime/dosprm.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: dosprm.scm,v 1.22 1994/11/20 05:12:28 cph Exp $
+$Id: dosprm.scm,v 1.23 1994/12/19 21:00:54 cph Exp $
 
 Copyright (c) 1992-94 Massachusetts Institute of Technology
 
@@ -313,7 +313,7 @@ MIT in each case. |#
 
 (define (cache-console-channel-descriptor!)
   (set! console-channel-descriptor
-       (if (string-ci=? microcode-id/operating-system-name "dos")
+       (if (eq? 'DOS microcode-id/operating-system)
            -1
            ((ucode-primitive get-handle 1) 1)))
   unspecific)

diff --git a/v7/src/runtime/pathnm.scm b/v7/src/runtime/pathnm.scm
index 88f8f62e6ab2e9250ecc643cc8cd58a2c4c74e1b..c118510f6a499a20ff2bc34b8ea4fbbcd13b7bd9 100644 (file)
--- a/v7/src/runtime/pathnm.scm
+++ b/v7/src/runtime/pathnm.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: pathnm.scm,v 14.28 1994/11/28 05:44:35 cph Exp $
+$Id: pathnm.scm,v 14.29 1994/12/19 21:03:26 cph Exp $
 
 Copyright (c) 1988-94 Massachusetts Institute of Technology
 
@@ -634,9 +634,7 @@ these rules:
                      fail fail fail))))
 
 (define (reset-package!)
-  (let ((host-type
-        (host-name->type
-         (intern (microcode-identification-item 'OS-NAME-STRING))))
+  (let ((host-type (host-name->type microcode-id/operating-system))
        (n-types (+ (apply max (map car known-host-types)) 1)))
     (let ((types (make-vector n-types #f)))
       (for-each (lambda (type) (vector-set! types (car type) (cdr type)))

diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index 3fa82b7bfdfd4c80174d23ebc6084048c1f5a621..95c268d5eac263707dddda7005e3635e570ff3d3 100644 (file)
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.pkg,v 14.238 1994/12/02 16:42:11 adams Exp $
+$Id: runtime.pkg,v 14.239 1994/12/19 21:03:43 cph Exp $
 
 Copyright (c) 1988-94 Massachusetts Institute of Technology
 
@@ -1315,6 +1315,7 @@ MIT in each case. |#
          microcode-id/floating-epsilon
          microcode-id/floating-mantissa-bits
          microcode-id/modification
+         microcode-id/operating-system
          microcode-id/operating-system-name
          microcode-id/operating-system-variant
          microcode-id/release-string

diff --git a/v7/src/runtime/utabs.scm b/v7/src/runtime/utabs.scm
index a8773d391c988ed897139c3892134590eccc4559..f39a81c7bcf3fc0d4d037f748aeb48f5b60f35b9 100644 (file)
--- a/v7/src/runtime/utabs.scm
+++ b/v7/src/runtime/utabs.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/utabs.scm,v 14.11 1992/05/27 22:44:52 jinx Exp $
+$Id: utabs.scm,v 14.12 1994/12/19 21:04:13 cph Exp $
 
-Copyright (c) 1988-1992 Massachusetts Institute of Technology
+Copyright (c) 1988-94 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -46,7 +46,8 @@ MIT in each case. |#
                (old-vector (vector-copy identification-vector)))
            (let loop ((fields '(CONSOLE-WIDTH CONSOLE-HEIGHT)))
              (if (not (null? fields))
-                 (let ((slot (microcode-identification-vector-slot (car fields))))
+                 (let ((slot
+                        (microcode-identification-vector-slot (car fields))))
                    (vector-set! old-vector slot false)
                    (vector-set! new-vector slot false)
                    (loop (cdr fields)))))
@@ -91,8 +92,9 @@ MIT in each case. |#
        (microcode-identification-item 'FLONUM-MANTISSA-LENGTH))
   (set! microcode-id/floating-epsilon
        (microcode-identification-item 'FLONUM-EPSILON))
-  (set! microcode-id/operating-system-name
-       (microcode-identification-item 'OS-NAME-STRING))
+  (let ((name (microcode-identification-item 'OS-NAME-STRING)))
+    (set! microcode-id/operating-system (intern name))
+    (set! microcode-id/operating-system-name name))
   (set! microcode-id/operating-system-variant
        (microcode-identification-item 'OS-VARIANT-STRING))
   (set! microcode-id/stack-type
@@ -115,6 +117,7 @@ MIT in each case. |#
 (define microcode-id/tty-y-size)
 (define microcode-id/floating-mantissa-bits)
 (define microcode-id/floating-epsilon)
+(define microcode-id/operating-system)
 (define microcode-id/operating-system-name)
 (define microcode-id/operating-system-variant)
 (define microcode-id/stack-type)

diff --git a/v8/src/runtime/runtime.pkg b/v8/src/runtime/runtime.pkg
index 3fa82b7bfdfd4c80174d23ebc6084048c1f5a621..95c268d5eac263707dddda7005e3635e570ff3d3 100644 (file)
--- a/v8/src/runtime/runtime.pkg
+++ b/v8/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.pkg,v 14.238 1994/12/02 16:42:11 adams Exp $
+$Id: runtime.pkg,v 14.239 1994/12/19 21:03:43 cph Exp $
 
 Copyright (c) 1988-94 Massachusetts Institute of Technology
 
@@ -1315,6 +1315,7 @@ MIT in each case. |#
          microcode-id/floating-epsilon
          microcode-id/floating-mantissa-bits
          microcode-id/modification
+         microcode-id/operating-system
          microcode-id/operating-system-name
          microcode-id/operating-system-variant
          microcode-id/release-string