From 62e95b4e33a18683689820eb5c1d1fd54098828a Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Sat, 29 Mar 2003 15:48:26 +0000 Subject: [PATCH] 0.pre8.14: Merge x86-vm cleanup patch (NJF sbcl-devel 2003-03-23) ... slightly fewer bare constants in the code has to be a good thing --- src/code/x86-vm.lisp | 9 +++++---- version.lisp-expr | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/code/x86-vm.lisp b/src/code/x86-vm.lisp index 833460c..0b15e82 100644 --- a/src/code/x86-vm.lisp +++ b/src/code/x86-vm.lisp @@ -89,11 +89,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 +114,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)))))) @@ -155,7 +156,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. diff --git a/version.lisp-expr b/version.lisp-expr index 89090f7..f051aa0 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -18,4 +18,4 @@ ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.pre8.13" +"0.pre8.14" -- 1.7.10.4