X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fgenesis.lisp;h=277f0c6849624e84c660bf640de3e6311dbb2467;hb=f3783ae14bde14c5aefd3d9383d89379defcb00f;hp=566ba5445d9d3ff1c0b7a2e9ca06d684f96d3b51;hpb=8fc5fda05f92d69c95b47e4ad7561d91dab18c3e;p=sbcl.git diff --git a/src/compiler/generic/genesis.lisp b/src/compiler/generic/genesis.lisp index 566ba54..277f0c6 100644 --- a/src/compiler/generic/genesis.lisp +++ b/src/compiler/generic/genesis.lisp @@ -2639,7 +2639,7 @@ ;; We actually ran GENESIS, use the real value. (descriptor-bits (cold-intern symbol)) ;; We didn't run GENESIS, so guess at the address. - (+ sb!vm:*target-static-space-start* + (+ sb!vm:*static-space-start* sb!vm:word-bytes sb!vm:other-pointer-type (if symbol (sb!vm:static-symbol-offset symbol) 0))))) @@ -2940,13 +2940,13 @@ initially undefined function references:~2%") (*cold-package-symbols* nil) (*read-only* (make-gspace :read-only read-only-space-id - sb!vm:*target-read-only-space-start*)) + sb!vm:*read-only-space-start*)) (*static* (make-gspace :static static-space-id - sb!vm:*target-static-space-start*)) + sb!vm:*static-space-start*)) (*dynamic* (make-gspace :dynamic dynamic-space-id - sb!vm:*target-dynamic-space-start*)) + sb!vm:*dynamic-space-start*)) (*nil-descriptor* (make-nil-descriptor)) (*current-reversed-cold-toplevels* *nil-descriptor*) (*unbound-marker* (make-other-immediate-descriptor @@ -3028,11 +3028,11 @@ initially undefined function references:~2%") (finalize-load-time-value-noise) ;; Tell the target Lisp how much stuff we've allocated. - (cold-set '*read-only-space-free-pointer* + (cold-set 'sb!vm:*read-only-space-free-pointer* (allocate-descriptor *read-only* 0 sb!vm:even-fixnum-type)) - (cold-set '*static-space-free-pointer* + (cold-set 'sb!vm:*static-space-free-pointer* (allocate-descriptor *static* 0 sb!vm:even-fixnum-type)) - (cold-set '*initial-dynamic-space-free-pointer* + (cold-set 'sb!vm:*initial-dynamic-space-free-pointer* (allocate-descriptor *dynamic* 0 sb!vm:even-fixnum-type)) (/show "done setting free pointers")