X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fobjdef.lisp;h=0659a28110cb48e3934faa3d230f5f67b7ea82fd;hb=75b52379bdc2269961af6a1308eca63610f38ac3;hp=5228849ca98d2f16176094642dcb1cf5606d8d60;hpb=21c2b080d512e218485a3969b773bea62a50b73d;p=sbcl.git diff --git a/src/compiler/generic/objdef.lisp b/src/compiler/generic/objdef.lisp index 5228849..0659a28 100644 --- a/src/compiler/generic/objdef.lisp +++ b/src/compiler/generic/objdef.lisp @@ -96,6 +96,8 @@ (define-primitive-object (array :lowtag other-pointer-lowtag :widetag t) + ;; FILL-POINTER of an ARRAY is in the same place as LENGTH of a + ;; VECTOR -- see SHRINK-VECTOR. (fill-pointer :type index :ref-trans %array-fill-pointer :ref-known (flushable foldable) @@ -131,6 +133,8 @@ (define-primitive-object (vector :type vector :lowtag other-pointer-lowtag :widetag t) + ;; FILL-POINTER of an ARRAY is in the same place as LENGTH of a + ;; VECTOR -- see SHRINK-VECTOR. (length :ref-trans sb!c::vector-length :type index) (data :rest-p t :c-type #!-alpha "unsigned long" #!+alpha "u32")) @@ -309,13 +313,9 @@ ;;;; symbols -#!+x86 -(defknown symbol-hash (symbol) (integer 0 #.sb!xc:most-positive-fixnum) - (flushable movable)) - (define-primitive-object (symbol :lowtag other-pointer-lowtag :widetag symbol-header-widetag - #!-x86 :alloc-trans #!-x86 make-symbol) + :alloc-trans make-symbol) ;; Beware when changing this definition. NIL-the-symbol is defined ;; using this layout, and NIL-the-end-of-list-marker is the cons @@ -323,11 +323,14 @@ ;; (conses have no header). Careful selection of lowtags ensures ;; that the same pointer can be used for both purposes: ;; OTHER-POINTER-LOWTAG is 7, LIST-POINTER-LOWTAG is 3, so if you - ;; subtract 3 from (sb-kernel:get-lisp-obj-address 'NIL) you get the + ;; subtract 3 from (SB-KERNEL:GET-LISP-OBJ-ADDRESS 'NIL) you get the ;; first data slot, and if you subtract 7 you get a symbol header. - (value :init :unbound) ;also the CAR of NIL-as-end-of-list - (hash) ;the CDR of NIL-as-end-of-list + ;; also the CAR of NIL-as-end-of-list + (value :init :unbound :ref-known (flushable) :ref-trans symbol-global-value) + ;; also the CDR of NIL-as-end-of-list. Its reffer needs special + ;; care for this reason, as hash values must be fixnums. + (hash :set-trans %set-symbol-hash) (plist :ref-trans symbol-plist :set-trans %set-symbol-plist @@ -336,7 +339,7 @@ (package :ref-trans symbol-package :set-trans %set-symbol-package :init :null) - #!+sb-thread (tls-index)) + #!+sb-thread (tls-index :ref-known (flushable) :ref-trans symbol-tls-index)) (define-primitive-object (complex-single-float :lowtag other-pointer-lowtag @@ -351,14 +354,6 @@ (real :c-type "double" :length 2) (imag :c-type "double" :length 2)) -#!+long-float -(define-primitive-object (complex-long-float - :lowtag other-pointer-lowtag - :widetag complex-long-float-widetag) - #!+sparc (filler) - (real :c-type "long double" :length #!+x86 3 #!+sparc 4) - (imag :c-type "long double" :length #!+x86 3 #!+sparc 4)) - ;;; this isn't actually a lisp object at all, it's a c structure that lives ;;; in c-land. However, we need sight of so many parts of it from Lisp that ;;; it makes sense to define it here anyway, so that the GENESIS machinery @@ -380,6 +375,7 @@ (tls-cookie) ; on x86, the LDT index (this :c-type "struct thread *" :length #!+alpha 2 #!-alpha 1) (next :c-type "struct thread *" :length #!+alpha 2 #!-alpha 1) + (state) ; running, stopping, stopped, dead #!+x86 (pseudo-atomic-atomic) #!+x86 (pseudo-atomic-interrupted) (interrupt-data :c-type "struct interrupt_data *"