Adapt to new representation used for microcode version info.

diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index c16cdb24454c7ecf223392ca7a96f9d6c02c707e..75f391f2aac203317d6b77884425b50aa963591a 100644 (file)
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.pkg,v 14.449 2003/07/21 00:59:52 cph Exp $
+$Id: runtime.pkg,v 14.450 2003/07/22 02:32:26 cph Exp $
 
 Copyright 1988,1989,1990,1991,1992,1993 Massachusetts Institute of Technology
 Copyright 1994,1995,1996,1997,1998,1999 Massachusetts Institute of Technology
@@ -2172,20 +2172,19 @@ USA.
          fixed-object/name->code
          fixed-objects-item
          fixed-objects-vector-slot
+         get-microcode-version-numbers
+         get-microcode-version-string
          microcode-error/code->name
          microcode-error/code-limit
          microcode-error/name->code
          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
          microcode-id/stack-type
          microcode-id/tty-x-size
          microcode-id/tty-y-size
-         microcode-id/version
          microcode-identification-item
          microcode-identification-vector-slot
          microcode-object/unassigned

diff --git a/v7/src/runtime/utabs.scm b/v7/src/runtime/utabs.scm
index fdb168e7d07122319c9dfcd4988394e00ff29e36..f83d7efc611fe17d2632ccca7eb78efacab25dd8 100644 (file)
--- a/v7/src/runtime/utabs.scm
+++ b/v7/src/runtime/utabs.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: utabs.scm,v 14.16 2003/02/14 18:28:34 cph Exp $
+$Id: utabs.scm,v 14.17 2003/07/22 02:32:30 cph Exp $
 
 Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology
 
@@ -72,12 +72,15 @@ USA.
   (set! non-object-slot (fixed-object/name->code 'NON-OBJECT))
   (set! system-call-names-slot (fixed-object/name->code 'SYSTEM-CALL-NAMES))
   (set! system-call-errors-slot (fixed-object/name->code 'SYSTEM-CALL-ERRORS))
-  (set! microcode-id/version
-       (microcode-identification-item 'MICROCODE-VERSION))
-  (set! microcode-id/modification
-       (microcode-identification-item 'MICROCODE-MODIFICATION))
-  (set! microcode-id/release-string
-       (microcode-identification-item 'SYSTEM-RELEASE-STRING))
+  (set! microcode-version-string
+       (let ((version (microcode-identification-item 'MICROCODE-VERSION)))
+         (if (string? version)
+             version
+             (string-append
+              (number->string version)
+              "."
+              (number->string
+               (microcode-identification-item 'MICROCODE-VERSION))))))
   (set! char:newline (microcode-identification-item 'NEWLINE-CHAR))
   (set! microcode-id/floating-mantissa-bits
        (microcode-identification-item 'FLONUM-MANTISSA-LENGTH))
@@ -107,10 +110,15 @@ USA.
        ((ucode-primitive substring-downcase!) result 0 size)
        result))))
 
+(define (get-microcode-version-string)
+  microcode-version-string)
+
+(define (get-microcode-version-numbers)
+  (map (lambda (s) (or (string->number s) s))
+       (burst-string microcode-version-string #\. #f)))
+
 (define microcode-tables-identification)
-(define microcode-id/version)
-(define microcode-id/modification)
-(define microcode-id/release-string)
+(define microcode-version-string)
 (define char:newline)
 (define microcode-id/tty-x-size)
 (define microcode-id/tty-y-size)

diff --git a/v7/src/runtime/version.scm b/v7/src/runtime/version.scm
index adfe1e84e3f32d9ea672b2a5d74e0057ef629ead..b1e86c83d1a3efac865cc6a5e249598ee9a16c02 100644 (file)
--- a/v7/src/runtime/version.scm
+++ b/v7/src/runtime/version.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: version.scm,v 14.213 2003/04/25 03:56:40 cph Exp $
+$Id: version.scm,v 14.214 2003/07/22 02:32:34 cph Exp $
 
 Copyright 1988,1989,1990,1991,1992,1993 Massachusetts Institute of Technology
 Copyright 1995,1996,1997,1998,1999,2000 Massachusetts Institute of Technology
@@ -38,5 +38,4 @@ USA.
 
 (define (snarf-microcode-version!)
   (add-subsystem-identification! "Microcode"
-                                (list microcode-id/version
-                                      microcode-id/modification)))
\ No newline at end of file
+                                (get-microcode-version-numbers)))
\ No newline at end of file