X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fx86-vm.lisp;h=c366a8f014ed2aae5ac4969c585086925a639917;hb=4cf50b1896b25f5337e7c258b0b560da00d47993;hp=a305dd014cca7c270d4670713298ab7e284f82f8;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git

diff --git a/src/code/x86-vm.lisp b/src/code/x86-vm.lisp
index a305dd0..c366a8f 100644
--- a/src/code/x86-vm.lisp
+++ b/src/code/x86-vm.lisp
@@ -127,7 +127,7 @@
 ;;; 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)))
 	     (cond ((typep fixups '(simple-array (unsigned-byte 32) (*)))
@@ -138,12 +138,10 @@
 		      (setf (code-header-ref code sb!vm: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)
 				(zerop fixups))
-		      (%primitive print "** Init. code FU"))
+		      (sb!impl::!cold-lose "Argh! can't process fixup"))
 		    (setf (code-header-ref code sb!vm:code-constants-offset)
 			  (make-specializable-array
 			   1
@@ -239,6 +237,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:
@@ -261,7 +260,7 @@
 (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))
     ;; using INT3 the pc is .. INT3 <here> code length bytes...
@@ -270,24 +269,24 @@
       (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))
+      (/hexstr length)
+      (/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))
       (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)))))))
 
@@ -297,18 +296,17 @@
   (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*)