X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fx86-vm.lisp;h=d49f487cbc3c332d078c4d24dad0fa83b5e4c22b;hb=15d6e7c9a2c3234f95dfe278046fa2fee1b0c007;hp=e105241c91c7d8f3f5eea01d77d8c02df17721c6;hpb=d93e034b8a53d8e3d8d6fa8b768cb5952d3ee548;p=sbcl.git diff --git a/src/code/x86-vm.lisp b/src/code/x86-vm.lisp index e105241..d49f487 100644 --- a/src/code/x86-vm.lisp +++ b/src/code/x86-vm.lisp @@ -41,10 +41,25 @@ "Return a string describing the type of the local machine." "X86") -(defun machine-version () - #!+sb-doc - "Return a string describing the version of the local machine." - "X86") +;;; arch-specific support for CL:MACHINE-VERSION, defined OAOO elsewhere +(defun get-machine-version () + #!+linux + (with-open-file (stream "/proc/cpuinfo" + ;; Even on Linux it's an option to build + ;; kernels without /proc filesystems, so + ;; degrade gracefully. + :if-does-not-exist nil) + (loop with line while (setf line (read-line stream nil)) + ;; The field "model name" exists on kernel 2.4.21-rc6-ac1 + ;; anyway, with values e.g. + ;; "AMD Athlon(TM) XP 2000+" + ;; "Intel(R) Pentium(R) M processor 1300MHz" + ;; which seem comparable to the information in the example + ;; in the MACHINE-VERSION page of the ANSI spec. + when (eql (search "model name" line) 0) + return (string-trim " " (subseq line (1+ (position #\: line)))))) + #!-linux + nil) ;;;; :CODE-OBJECT fixups @@ -52,6 +67,12 @@ (defvar *num-fixups* 0) ;;; FIXME: When the system runs, it'd be interesting to see what this is. +(declaim (inline adjust-fixup-array)) +(defun adjust-fixup-array (array size) + (let ((new (make-array size :element-type '(unsigned-byte 32)))) + (replace new array) + new)) + ;;; This gets called by LOAD to resolve newly positioned objects ;;; with things (like code instructions) that have to refer to them. ;;; @@ -69,8 +90,7 @@ (let ((fixups (code-header-ref code code-constants-offset))) (cond ((typep fixups '(simple-array (unsigned-byte 32) (*))) (let ((new-fixups - (adjust-array fixups (1+ (length fixups)) - :element-type '(unsigned-byte 32)))) + (adjust-fixup-array fixups (1+ (length fixups))))) (setf (aref new-fixups (length fixups)) offset) (setf (code-header-ref code code-constants-offset) new-fixups))) @@ -80,7 +100,7 @@ (zerop fixups)) (format t "** Init. code FU = ~S~%" fixups)) ; FIXME (setf (code-header-ref code code-constants-offset) - (make-specializable-array + (make-array 1 :element-type '(unsigned-byte 32) :initial-element offset))))))) @@ -89,11 +109,12 @@ (sb!kernel:code-instructions code))) (obj-start-addr (logand (sb!kernel:get-lisp-obj-address code) #xfffffff8)) - #+nil (const-start-addr (+ obj-start-addr (* 5 4))) + ;; FIXME: what is this 5? + #+nil (const-start-addr (+ obj-start-addr (* 5 n-word-bytes))) (code-start-addr (sb!sys:sap-int (sb!kernel:code-instructions code))) (ncode-words (sb!kernel:code-header-ref code 1)) - (code-end-addr (+ code-start-addr (* ncode-words 4)))) + (code-end-addr (+ code-start-addr (* ncode-words n-word-bytes)))) (unless (member kind '(:absolute :relative)) (error "Unknown code-object-fixup kind ~S." kind)) (ecase kind @@ -113,7 +134,7 @@ (add-fixup code offset)) ;; Replace word with value to add to that loc to get there. (let* ((loc-sap (+ (sap-int sap) offset)) - (rel-val (- fixup loc-sap 4))) + (rel-val (- fixup loc-sap n-word-bytes))) (declare (type (unsigned-byte 32) loc-sap) (type (signed-byte 32) rel-val)) (setf (signed-sap-ref-32 sap offset) rel-val)))))) @@ -132,8 +153,7 @@ (let ((fixups (code-header-ref code code-constants-offset))) (cond ((typep fixups '(simple-array (unsigned-byte 32) (*))) (let ((new-fixups - (adjust-array fixups (1+ (length fixups)) - :element-type '(unsigned-byte 32)))) + (adjust-fixup-array fixups (1+ (length fixups))))) (setf (aref new-fixups (length fixups)) offset) (setf (code-header-ref code code-constants-offset) new-fixups))) @@ -143,7 +163,7 @@ (zerop fixups)) (sb!impl::!cold-lose "Argh! can't process fixup")) (setf (code-header-ref code code-constants-offset) - (make-specializable-array + (make-array 1 :element-type '(unsigned-byte 32) :initial-element offset))))))) @@ -155,7 +175,7 @@ (code-start-addr (sb!sys:sap-int (sb!kernel:code-instructions code))) (ncode-words (sb!kernel:code-header-ref code 1)) - (code-end-addr (+ code-start-addr (* ncode-words 4)))) + (code-end-addr (+ code-start-addr (* ncode-words n-word-bytes)))) (ecase kind (:absolute ;; Record absolute fixups that point within the code object. @@ -235,6 +255,7 @@ ;;; Given a signal context, return the floating point modes word in ;;; the same format as returned by FLOATING-POINT-MODES. +#!-linux (defun context-floating-point-modes (context) ;; FIXME: As of sbcl-0.6.7 and the big rewrite of signal handling for ;; POSIXness and (at the Lisp level) opaque signal contexts, @@ -255,6 +276,11 @@ (logior (ash (logand sw #xffff) 16) (logxor (logand cw #xffff) #x3f))) 0) + +#!+linux +(define-alien-routine ("os_context_fp_control" context-floating-point-modes) + (sb!alien:unsigned 32) + (context (* os-context-t))) ;;;; INTERNAL-ERROR-ARGS @@ -279,7 +305,7 @@ vector (* n-word-bits vector-data-offset) (* length n-byte-bits)) (let* ((index 0) - (error-number (sb!c::read-var-integer vector index))) + (error-number (sb!c:read-var-integer vector index))) (/hexstr error-number) (collect ((sc-offsets)) (loop @@ -287,18 +313,12 @@ (/hexstr index) (when (>= index length) (return)) - (let ((sc-offset (sb!c::read-var-integer vector index))) + (let ((sc-offset (sb!c:read-var-integer vector index))) (/show0 "SC-OFFSET=..") (/hexstr sc-offset) (sc-offsets sc-offset))) (values error-number (sc-offsets))))))) -;;; Do whatever is necessary to make the given code component -;;; executable. (This is a no-op on the x86.) -(defun sanctify-for-execution (component) - (declare (ignore component)) - nil) - ;;; This is used in error.lisp to insure that floating-point exceptions ;;; are properly trapped. The compiler translates this to a VOP. (defun float-wait ()