X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fx86-vm.lisp;h=73cb5ebbb76fe2f5f95e50616f4c93e9ff30519a;hb=bee53328c93be3433477821131ab805557476c8b;hp=9c1e08cc733b917352ffbaeee39f5c2a05118120;hpb=63fcb94b875a97e468d9add229e220ecceec2352;p=sbcl.git

diff --git a/src/code/x86-vm.lisp b/src/code/x86-vm.lisp
index 9c1e08c..73cb5eb 100644
--- a/src/code/x86-vm.lisp
+++ b/src/code/x86-vm.lisp
@@ -60,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 (get-type fixups)
+				    sb!vm:unbound-marker-type)
+				(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)))
@@ -320,10 +320,6 @@
 (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.
 (defvar *alien-stack*)