X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-load.lisp;h=b760221278de8885936417070258e41bc766cd26;hb=df679ed627975948b1cee190f4d79c397588c43e;hp=11de3e3c729586e8db3d74eb0e9ed37bbfee3992;hpb=b84b7f3a3c58909c6e252aba8c97148c9ad917b7;p=sbcl.git diff --git a/src/code/target-load.lisp b/src/code/target-load.lisp index 11de3e3..b760221 100644 --- a/src/code/target-load.lisp +++ b/src/code/target-load.lisp @@ -153,6 +153,7 @@ #!+sb-doc "Load the file given by FILESPEC into the Lisp environment, returning T on success." + (unless (eq external-format :default) (error "Non-:DEFAULT EXTERNAL-FORMAT values are not supported.")) @@ -236,13 +237,7 @@ (declare (fixnum i)) (push (pop-stack) stuff)) (let* ((dbi (car (last stuff))) ; debug-info - (tto (first stuff)) ; trace-table-offset - ;; Old CMU CL code had maybe-we-shouldn't-load-to-dyn-space - ;; pussyfooting around here, apparently dating back to the - ;; stone age of the X86 port, but in SBCL we always load - ;; to dynamic space. FIXME: So now this "variable" could go - ;; away entirely. - (load-to-dynamic-space t)) + (tto (first stuff))) ; trace-table-offset (setq stuff (nreverse stuff)) @@ -255,18 +250,11 @@ (sb!c::debug-info-p dbi) (sb!c::compiled-debug-info-name dbi) tto) - (if load-to-dynamic-space - (format t " loading to the dynamic space~%") - (format t " loading to the static space~%"))) + (format t " loading to the dynamic space~%")) - (let ((code - (if load-to-dynamic-space - (%primitive sb!c:allocate-dynamic-code-object - box-num - code-length) - (%primitive sb!c:allocate-code-object - box-num - code-length))) + (let ((code (%primitive sb!c:allocate-dynamic-code-object + box-num + code-length)) (index (+ sb!vm:code-trace-table-offset-slot box-num))) (declare (type index index)) (when *load-code-verbose*