X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fx86-vm.lisp;h=d0e88ad3808113134288244868d531165791a46f;hb=e33fb894f991b2926d8f3bace9058e4c0b2c3a37;hp=38aafabe05786c4b99399eed3966eeffee80e32e;hpb=6d9ecc45cb21a1208deb8c4d128adc04aa289c9d;p=sbcl.git diff --git a/src/code/x86-vm.lisp b/src/code/x86-vm.lisp index 38aafab..d0e88ad 100644 --- a/src/code/x86-vm.lisp +++ b/src/code/x86-vm.lisp @@ -10,9 +10,6 @@ ;;;; files for more information. (in-package "SB!VM") - -(file-comment - "$Header$") ;;;; OS-CONTEXT-T @@ -35,18 +32,18 @@ ;;; FIXME: Since SBCL, unlike CMU CL, uses this as an opaque type, ;;; it's no longer architecture-dependent, and probably belongs in ;;; some other package, perhaps SB-KERNEL. -(def-alien-type os-context-t (struct os-context-t-struct)) +(define-alien-type os-context-t (struct os-context-t-struct)) ;;;; MACHINE-TYPE and MACHINE-VERSION (defun machine-type () #!+sb-doc - "Returns a string describing the type of the local machine." + "Return a string describing the type of the local machine." "X86") (defun machine-version () #!+sb-doc - "Returns a string describing the version of the local machine." + "Return a string describing the version of the local machine." "X86") ;;;; :CODE-OBJECT fixups @@ -63,30 +60,30 @@ (defun fixup-code-object (code offset fixup kind) (declare (type index offset)) (flet ((add-fixup (code offset) - ;; Although this could check for and ignore fixups for code - ;; objects in the read-only and static spaces, this should - ;; only be the case when *enable-dynamic-space-code* is - ;; True. - (when sb!impl::*enable-dynamic-space-code* - (incf *num-fixups*) - (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)))) - (setf (aref new-fixups (length fixups)) offset) - (setf (code-header-ref code code-constants-offset) - new-fixups))) - (t - (unless (or (eq (get-type fixups) - sb!vm:unbound-marker-type) - (zerop fixups)) - (format t "** Init. code FU = ~S~%" fixups)) ; FIXME + ;; (We check for and ignore fixups for code objects in the + ;; read-only and static spaces. (In the old CMU CL code + ;; this check was conditional on *ENABLE-DYNAMIC-SPACE-CODE*, + ;; but in SBCL relocatable dynamic space code is always in + ;; use, so we always do the check.) + (incf *num-fixups*) + (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)))) + (setf (aref new-fixups (length fixups)) offset) (setf (code-header-ref code code-constants-offset) - (make-specializable-array - 1 - :element-type '(unsigned-byte 32) - :initial-element offset)))))))) + new-fixups))) + (t + (unless (or (eq (widetag-of fixups) + unbound-marker-widetag) + (zerop fixups)) + (format t "** Init. code FU = ~S~%" fixups)) ; FIXME + (setf (code-header-ref code code-constants-offset) + (make-specializable-array + 1 + :element-type '(unsigned-byte 32) + :initial-element offset))))))) (sb!sys:without-gcing (let* ((sap (truly-the system-area-pointer (sb!kernel:code-instructions code))) @@ -130,24 +127,22 @@ ;;; load time instead of in GENESIS. It's probably simple, I just haven't ;;; figured it out, or found it written down anywhere. -- WHN 19990908 #!+gencgc -(defun do-load-time-code-fixup (code offset fixup kind) +(defun !do-load-time-code-fixup (code offset fixup kind) (flet ((add-load-time-code-fixup (code offset) - (let ((fixups (code-header-ref code sb!vm:code-constants-offset))) + (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)))) (setf (aref new-fixups (length fixups)) offset) - (setf (code-header-ref code sb!vm:code-constants-offset) + (setf (code-header-ref code code-constants-offset) new-fixups))) (t - ;; FIXME: This doesn't look like production code, and - ;; should be a fatal error, not just a print. - (unless (or (eq (get-type fixups) - sb!vm:unbound-marker-type) + (unless (or (eq (widetag-of fixups) + unbound-marker-widetag) (zerop fixups)) - (%primitive print "** Init. code FU")) - (setf (code-header-ref code sb!vm:code-constants-offset) + (sb!impl::!cold-lose "Argh! can't process fixup")) + (setf (code-header-ref code code-constants-offset) (make-specializable-array 1 :element-type '(unsigned-byte 32) @@ -188,7 +183,7 @@ ;;;; and internal error handling) the extra runtime cost should be ;;;; negligible. -(def-alien-routine ("os_context_pc_addr" context-pc-addr) (* unsigned-int) +(define-alien-routine ("os_context_pc_addr" context-pc-addr) (* unsigned-int) ;; (Note: Just as in CONTEXT-REGISTER-ADDR, we intentionally use an ;; 'unsigned *' interpretation for the 32-bit word passed to us by ;; the C code, even though the C code may think it's an 'int *'.) @@ -196,9 +191,11 @@ (defun context-pc (context) (declare (type (alien (* os-context-t)) context)) - (int-sap (deref (context-pc-addr context)))) + (let ((addr (context-pc-addr context))) + (declare (type (alien (* unsigned-int)) addr)) + (int-sap (deref addr)))) -(def-alien-routine ("os_context_register_addr" context-register-addr) +(define-alien-routine ("os_context_register_addr" context-register-addr) (* unsigned-int) ;; (Note the mismatch here between the 'int *' value that the C code ;; may think it's giving us and the 'unsigned *' value that we @@ -209,19 +206,20 @@ (context (* os-context-t)) (index int)) -;;; FIXME: Should this and CONTEXT-PC be INLINE to reduce consing? -;;; (Are they used in anything time-critical, or just the debugger?) (defun context-register (context index) (declare (type (alien (* os-context-t)) context)) - (deref (context-register-addr context index))) + (let ((addr (context-register-addr context index))) + (declare (type (alien (* unsigned-int)) addr)) + (deref addr))) (defun %set-context-register (context index new) -(declare (type (alien (* os-context-t)) context)) -(setf (deref (context-register-addr context index)) - new)) + (declare (type (alien (* os-context-t)) context)) + (let ((addr (context-register-addr context index))) + (declare (type (alien (* unsigned-int)) addr)) + (setf (deref addr) new))) -;;; Like CONTEXT-REGISTER, but returns the value of a float register. -;;; FORMAT is the type of float to return. +;;; This is like CONTEXT-REGISTER, but returns the value of a float +;;; register. FORMAT is the type of float to return. ;;; ;;; As of sbcl-0.6.7, there is no working code which calls this code, ;;; so it's stubbed out. Someday, in order to make the debugger work @@ -242,6 +240,7 @@ ;; POSIXness and (at the Lisp level) opaque signal contexts, ;; this is stubified. It needs to be rewritten as an ;; alien function. + (declare (ignore context)) ; stub! (warn "stub CONTEXT-FLOATING-POINT-MODES") ;; old code for Linux: @@ -264,33 +263,33 @@ (defun internal-error-arguments (context) (declare (type (alien (* os-context-t)) context)) (/show0 "entering INTERNAL-ERROR-ARGUMENTS, CONTEXT=..") - #!+sb-show (sb!sys:%primitive print (sb!impl::hexstr context)) + (/hexstr context) (let ((pc (context-pc context))) (declare (type system-area-pointer pc)) + (/show0 "got PC") ;; using INT3 the pc is .. INT3 code length bytes... (let* ((length (sap-ref-8 pc 1)) (vector (make-array length :element-type '(unsigned-byte 8)))) (declare (type (unsigned-byte 8) length) (type (simple-array (unsigned-byte 8) (*)) vector)) (/show0 "LENGTH,VECTOR,ERROR-NUMBER=..") - #!+sb-show (sb!sys:%primitive print (sb!impl::hexstr length)) - #!+sb-show (sb!sys:%primitive print (sb!impl::hexstr vector)) - (copy-from-system-area pc (* sb!vm:byte-bits 2) - vector (* sb!vm:word-bits - sb!vm:vector-data-offset) - (* length sb!vm:byte-bits)) + (/hexstr length) + (/hexstr vector) + (copy-from-system-area pc (* n-byte-bits 2) + vector (* n-word-bits vector-data-offset) + (* length n-byte-bits)) (let* ((index 0) (error-number (sb!c::read-var-integer vector index))) - #!+sb-show (sb!sys:%primitive print (sb!impl::hexstr error-number)) + (/hexstr error-number) (collect ((sc-offsets)) (loop (/show0 "INDEX=..") - #!+sb-show (sb!sys:%primitive print (sb!impl::hexstr index)) + (/hexstr index) (when (>= index length) (return)) (let ((sc-offset (sb!c::read-var-integer vector index))) (/show0 "SC-OFFSET=..") - #!+sb-show (sb!sys:%primitive print (sb!impl::hexstr sc-offset)) + (/hexstr sc-offset) (sc-offsets sc-offset))) (values error-number (sc-offsets))))))) @@ -300,23 +299,22 @@ (declare (ignore component)) nil) -;;; FLOAT-WAIT -;;; ;;; 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 () (float-wait)) -;;; FLOAT CONSTANTS +;;; float constants ;;; -;;; These are used by the FP MOVE-FROM-{SINGLE|DOUBLE} VOPs rather than the -;;; i387 load constant instructions to avoid consing in some cases. Note these -;;; are initialized by GENESIS as they are needed early. +;;; These are used by the FP MOVE-FROM-{SINGLE|DOUBLE} VOPs rather +;;; than the i387 load constant instructions to avoid consing in some +;;; cases. Note these are initialized by GENESIS as they are needed +;;; early. (defvar *fp-constant-0s0*) (defvar *fp-constant-1s0*) (defvar *fp-constant-0d0*) (defvar *fp-constant-1d0*) -;;; The long-float constants. +;;; the long-float constants (defvar *fp-constant-0l0*) (defvar *fp-constant-1l0*) (defvar *fp-constant-pi*) @@ -325,25 +323,13 @@ (defvar *fp-constant-lg2*) (defvar *fp-constant-ln2*) -;;; Enable/disable scavenging of the read-only space. -(defvar *scavenge-read-only-space* nil) -;;; FIXME: should be *SCAVENGE-READ-ONLY-SPACE-P* - -;;; The current alien stack pointer; saved/restored for non-local exits. +;;; the current alien stack pointer; saved/restored for non-local exits (defvar *alien-stack*) -(defun sb!kernel::%instance-set-conditional (object slot test-value new-value) - (declare (type instance object) - (type index slot)) - #!+sb-doc - "Atomically compare object's slot value to test-value and if EQ store - new-value in the slot. The original value of the slot is returned." - (sb!kernel::%instance-set-conditional object slot test-value new-value)) - ;;; Support for the MT19937 random number generator. The update ;;; function is implemented as an assembly routine. This definition is -;;; transformed to a call to the assembly routine allowing its use in byte -;;; compiled code. +;;; transformed to a call to the assembly routine allowing its use in +;;; interpreted code. (defun random-mt19937 (state) (declare (type (simple-array (unsigned-byte 32) (627)) state)) (random-mt19937 state))