X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fx86-vm.lisp;h=203b2bb7dce50030db2ff89852f120dc8814c705;hb=a0a413499415738d23cc40baa44e9c404af54a94;hp=21c2f47b43d0b0a1bd383187c9b0b4a405f8152b;hpb=637371f800e71ac4449e01d59571c9d10f6bde26;p=sbcl.git

diff --git a/src/code/x86-vm.lisp b/src/code/x86-vm.lisp
index 21c2f47..203b2bb 100644
--- a/src/code/x86-vm.lisp
+++ b/src/code/x86-vm.lisp
@@ -52,6 +52,13 @@
 (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 ((length (length array))
+        (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 +76,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 +86,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 +95,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 +120,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 +139,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 +149,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 +161,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.
@@ -285,7 +291,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
@@ -293,7 +299,7 @@
 	   (/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)))