0.8.1.50

[sbcl.git] / src / code / ppc-vm.lisp

diff --git a/src/code/ppc-vm.lisp b/src/code/ppc-vm.lisp
index 7b0e199..1024998 100644 (file)
--- a/src/code/ppc-vm.lisp
+++ b/src/code/ppc-vm.lisp
@@ -2,9 +2,6 @@
 ;;;
 (in-package "SB!VM")
 
-(defvar *number-of-signals* 64)
-(defvar *bits-per-word* 32)
-
 (define-alien-type os-context-t (struct os-context-t-struct))
 
 \f
@@ -14,11 +11,29 @@
   "Returns a string describing the type of the local machine."
   "PowerPC")
 
-(defun machine-version ()
-  "Returns a string describing the version of the local machine."
-  "who-knows?")
-
-
+;;; support for CL:MACHINE-VERSION defined OAOO elsewhere
+(defun get-machine-version ()
+  #!+linux
+  (with-open-file (stream "/proc/cpuinfo"
+                         ;; /proc is optional even in Linux, so
+                         ;; fail gracefully.
+                         :if-does-not-exist nil)
+    (loop with line while (setf line (read-line stream nil))
+         ;; hoping "cpu" exists and gives something useful in
+         ;; all relevant Linuxen...
+         ;;
+         ;; from Lars Brinkhoff sbcl-devel 26 Jun 2003:
+         ;;   I examined different versions of Linux/PPC at
+         ;;   http://lxr.linux.no/ (the file that outputs
+         ;;   /proc/cpuinfo is arch/ppc/kernel/setup.c, if
+         ;;   you want to check), and all except 2.0.x
+         ;;   seemed to do the same thing as far as the
+         ;;   "cpu" field is concerned, i.e. it always
+         ;;   starts with the (C-syntax) string "cpu\t\t: ".
+          when (eql (search "cpu" line) 0)
+          return (string-trim " " (subseq line (1+ (position #\: line))))))
+  #!-linux
+  nil)
 \f
 ;;;; FIXUP-CODE-OBJECT
 
@@ -149,12 +164,12 @@
                                     sb!vm:vector-data-offset)
                           (* length sb!vm:n-byte-bits))
     (let* ((index 0)
-          (error-number (sb!c::read-var-integer vector index)))
+          (error-number (sb!c:read-var-integer vector index)))
       (collect ((sc-offsets))
               (loop
                (when (>= index length)
                  (return))
-               (sc-offsets (sb!c::read-var-integer vector index)))
+               (sc-offsets (sb!c:read-var-integer vector index)))
               (values error-number (sc-offsets))))))