X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fgenesis.lisp;h=fdfa8482bbef48ebd2c664503bdad811de837cfc;hb=77d94d36bcfd3d5eea73ad51e6ee621a8938f995;hp=4b9ce54a1288d2e262293394c05d2e1f47befdb2;hpb=eb5265ab22a2b1cae18bbdf43c871dba9b5927ea;p=sbcl.git diff --git a/src/compiler/generic/genesis.lisp b/src/compiler/generic/genesis.lisp index 4b9ce54..fdfa848 100644 --- a/src/compiler/generic/genesis.lisp +++ b/src/compiler/generic/genesis.lisp @@ -34,10 +34,10 @@ ;;; a magic number used to identify our core files (defconstant core-magic - (logior (ash (char-code #\S) 24) - (ash (char-code #\B) 16) - (ash (char-code #\C) 8) - (char-code #\L))) + (logior (ash (sb!xc:char-code #\S) 24) + (ash (sb!xc:char-code #\B) 16) + (ash (sb!xc:char-code #\C) 8) + (sb!xc:char-code #\L))) ;;; the current version of SBCL core files ;;; @@ -444,7 +444,7 @@ type))) (defun make-character-descriptor (data) - (make-other-immediate-descriptor data sb!vm:base-char-widetag)) + (make-other-immediate-descriptor data sb!vm:character-widetag)) (defun descriptor-beyond (des offset type) (let* ((low (logior (+ (logandc2 (descriptor-low des) sb!vm:lowtag-mask) @@ -608,9 +608,10 @@ ;;;; copying simple objects into the cold core -(defun string-to-core (string &optional (gspace *dynamic*)) +(defun base-string-to-core (string &optional (gspace *dynamic*)) #!+sb-doc - "Copy string into the cold core and return a descriptor to it." + "Copy STRING (which must only contain STANDARD-CHARs) into the cold +core and return a descriptor to it." ;; (Remember that the system convention for storage of strings leaves an ;; extra null byte at the end to aid in call-out to C.) (let* ((length (length string)) @@ -626,14 +627,7 @@ (make-fixnum-descriptor length)) (dotimes (i length) (setf (bvref bytes (+ offset i)) - ;; KLUDGE: There's no guarantee that the character - ;; encoding here will be the same as the character - ;; encoding on the target machine, so using CHAR-CODE as - ;; we do, or a bitwise copy as CMU CL code did, is sleazy. - ;; (To make this more portable, perhaps we could use - ;; indices into the sequence which is used to test whether - ;; a character is a STANDARD-CHAR?) -- WHN 19990817 - (char-code (aref string i)))) + (sb!xc:char-code (aref string i)))) (setf (bvref bytes (+ offset length)) 0) ; null string-termination character for C des)) @@ -815,7 +809,7 @@ (make-fixnum-descriptor 0)) (write-wordindexed symbol sb!vm:symbol-plist-slot *nil-descriptor*) (write-wordindexed symbol sb!vm:symbol-name-slot - (string-to-core name *dynamic*)) + (base-string-to-core name *dynamic*)) (write-wordindexed symbol sb!vm:symbol-package-slot *nil-descriptor*) symbol)) @@ -1201,7 +1195,7 @@ ;; because that's the way CMU CL did it; I'm ;; not sure whether there's an underlying ;; reason. -- WHN 1990826 - (string-to-core "NIL" *dynamic*)) + (base-string-to-core "NIL" *dynamic*)) (write-wordindexed des (+ 1 sb!vm:symbol-package-slot) result) @@ -1269,6 +1263,7 @@ (frob sub-gc) (frob internal-error) (frob sb!kernel::control-stack-exhausted-error) + (frob sb!kernel::undefined-alien-error) (frob sb!di::handle-breakpoint) (frob sb!di::handle-fun-end-breakpoint) (frob sb!thread::handle-thread-exit)) @@ -1286,7 +1281,7 @@ (let* ((cold-package (car cold-package-symbols-entry)) (symbols (cdr cold-package-symbols-entry)) (shadows (package-shadowing-symbols cold-package)) - (documentation (string-to-core (documentation cold-package t))) + (documentation (base-string-to-core (documentation cold-package t))) (internal *nil-descriptor*) (external *nil-descriptor*) (imported-internal *nil-descriptor*) @@ -1366,7 +1361,7 @@ (res *nil-descriptor*)) (dolist (u (package-use-list pkg)) (when (assoc u *cold-package-symbols*) - (cold-push (string-to-core (package-name u)) use))) + (cold-push (base-string-to-core (package-name u)) use))) (let* ((pkg-name (package-name pkg)) ;; Make the package nickname lists for the standard packages ;; be the minimum specified by ANSI, regardless of what value @@ -1387,7 +1382,7 @@ (t (package-nicknames pkg))))) (dolist (warm-nickname warm-nicknames) - (cold-push (string-to-core warm-nickname) cold-nicknames))) + (cold-push (base-string-to-core warm-nickname) cold-nicknames))) (cold-push (number-to-core (truncate (package-internal-symbol-count pkg) 0.8)) @@ -1404,7 +1399,7 @@ (cold-push use res) (cold-push (cold-intern :use) res) - (cold-push (string-to-core (package-name pkg)) res) + (cold-push (base-string-to-core (package-name pkg)) res) res)) ;;;; functions and fdefinition objects @@ -1857,7 +1852,7 @@ (defun foreign-symbols-to-core () (let ((result *nil-descriptor*)) (maphash (lambda (symbol value) - (cold-push (cold-cons (string-to-core symbol) + (cold-push (cold-cons (base-string-to-core symbol) (number-to-core value)) result)) *cold-foreign-symbol-table*) @@ -1998,21 +1993,21 @@ (depthoid (descriptor-fixnum depthoid-des))) (unless (= length old-length) (error "cold loading a reference to class ~S when the compile~%~ - time length was ~S and current length is ~S" + time length was ~S and current length is ~S" name length old-length)) (unless (equal inherits-list old-inherits-list) (error "cold loading a reference to class ~S when the compile~%~ - time inherits were ~S~%~ - and current inherits are ~S" + time inherits were ~S~%~ + and current inherits are ~S" name inherits-list old-inherits-list)) (unless (= depthoid old-depthoid) (error "cold loading a reference to class ~S when the compile~%~ - time inheritance depthoid was ~S and current inheritance~%~ - depthoid is ~S" + time inheritance depthoid was ~S and current inheritance~%~ + depthoid is ~S" name depthoid old-depthoid))) @@ -2105,12 +2100,17 @@ ;;;; cold fops for loading vectors -(clone-cold-fop (fop-string) - (fop-small-string) +(clone-cold-fop (fop-base-string) + (fop-small-base-string) (let* ((len (clone-arg)) (string (make-string len))) (read-string-as-bytes *fasl-input-stream* string) - (string-to-core string))) + (base-string-to-core string))) + +#!+sb-unicode +(clone-cold-fop (fop-character-string) + (fop-small-character-string) + (bug "CHARACTER-STRING dumped by cross-compiler.")) (clone-cold-fop (fop-vector) (fop-small-vector) @@ -2989,7 +2989,7 @@ initially undefined function references:~2%") ;; (We write each character as a word in order to avoid ;; having to think about word alignment issues in the ;; sbcl-0.7.8 version of coreparse.c.) - (write-word (char-code char)))) + (write-word (sb!xc:char-code char)))) ;; Write the New Directory entry header. (write-word new-directory-core-entry-type-code)