X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Fgeneric%2Fobjdef.lisp;h=dcc1c72cfce13fef9a08c5e484102032dbef1a8b;hb=1dd5275c69e1260d0a049052b99938fb043355fd;hp=5bfa3bcd2802aaf793d39dbc7bd7386c12ba3488;hpb=d6f9676ae94419cb5544c45821a8d31adbc1fbe8;p=sbcl.git diff --git a/src/compiler/generic/objdef.lisp b/src/compiler/generic/objdef.lisp index 5bfa3bc..dcc1c72 100644 --- a/src/compiler/generic/objdef.lisp +++ b/src/compiler/generic/objdef.lisp @@ -35,7 +35,8 @@ ;;;; the primitive objects themselves -(define-primitive-object (cons :lowtag list-pointer-lowtag +(define-primitive-object (cons :type cons + :lowtag list-pointer-lowtag :alloc-trans cons) (car :ref-trans car :set-trans sb!c::%rplaca :init :arg :cas-trans %compare-and-swap-car) @@ -102,37 +103,37 @@ :ref-trans %array-fill-pointer :ref-known (flushable foldable) :set-trans (setf %array-fill-pointer) - :set-known (unsafe)) + :set-known ()) (fill-pointer-p :type (member t nil) :ref-trans %array-fill-pointer-p :ref-known (flushable foldable) :set-trans (setf %array-fill-pointer-p) - :set-known (unsafe)) + :set-known ()) (elements :type index :ref-trans %array-available-elements :ref-known (flushable foldable) :set-trans (setf %array-available-elements) - :set-known (unsafe)) + :set-known ()) (data :type array :ref-trans %array-data-vector :ref-known (flushable foldable) :set-trans (setf %array-data-vector) - :set-known (unsafe)) + :set-known ()) (displacement :type (or index null) :ref-trans %array-displacement :ref-known (flushable foldable) :set-trans (setf %array-displacement) - :set-known (unsafe)) + :set-known ()) (displaced-p :type t :ref-trans %array-displaced-p :ref-known (flushable foldable) :set-trans (setf %array-displaced-p) - :set-known (unsafe)) + :set-known ()) (displaced-from :type list :ref-trans %array-displaced-from :ref-known (flushable) :set-trans (setf %array-displaced-from) - :set-known (unsafe)) + :set-known ()) (dimensions :rest-p t)) (define-primitive-object (vector :type vector @@ -153,12 +154,12 @@ (entry-points :type (or function null) :ref-known (flushable) :ref-trans %code-entry-points - :set-known (unsafe) + :set-known () :set-trans (setf %code-entry-points)) (debug-info :type t :ref-known (flushable) :ref-trans %code-debug-info - :set-known (unsafe) + :set-known () :set-trans (setf %code-debug-info)) (trace-table-offset) (constants :rest-p t)) @@ -196,20 +197,20 @@ (next :type (or function null) :ref-known (flushable) :ref-trans %simple-fun-next - :set-known (unsafe) + :set-known () :set-trans (setf %simple-fun-next)) (name :ref-known (flushable) :ref-trans %simple-fun-name - :set-known (unsafe) + :set-known () :set-trans (setf %simple-fun-name)) (arglist :type list :ref-known (flushable) :ref-trans %simple-fun-arglist - :set-known (unsafe) + :set-known () :set-trans (setf %simple-fun-arglist)) (type :ref-known (flushable) :ref-trans %simple-fun-type - :set-known (unsafe) + :set-known () :set-trans (setf %simple-fun-type)) ;; NIL for empty, STRING for a docstring, SIMPLE-VECTOR for XREFS, and (CONS ;; STRING SIMPLE-VECTOR) for both. @@ -217,12 +218,12 @@ :ref-trans %simple-fun-info :ref-known (flushable) :set-trans (setf %simple-fun-info) - :set-known (unsafe)) + :set-known ()) ;; the SB!C::DEBUG-FUN object corresponding to this object, or NIL for none #+nil ; FIXME: doesn't work (gotcha, lowly maintenoid!) See notes on bug 137. (debug-fun :ref-known (flushable) :ref-trans %simple-fun-debug-fun - :set-known (unsafe) + :set-known () :set-trans (setf %simple-fun-debug-fun)) (code :rest-p t :c-type "unsigned char")) @@ -240,7 +241,7 @@ :alloc-trans %make-funcallable-instance) (trampoline :init :funcallable-instance-tramp) (function :ref-known (flushable) :ref-trans %funcallable-instance-function - :set-known (unsafe) :set-trans (setf %funcallable-instance-function)) + :set-known () :set-trans (setf %funcallable-instance-function)) (info :rest-p t)) (define-primitive-object (value-cell :lowtag other-pointer-lowtag @@ -249,7 +250,7 @@ ;; for this. Is this needed as well? :alloc-trans make-value-cell) (value :set-trans value-cell-set - :set-known (unsafe) + :set-known () :ref-trans value-cell-ref :ref-known (flushable) :init :arg)) @@ -309,7 +310,8 @@ (define-primitive-object (symbol :lowtag other-pointer-lowtag :widetag symbol-header-widetag - :alloc-trans %make-symbol) + :alloc-trans %make-symbol + :type 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,7 +325,7 @@ ;; also the CAR of NIL-as-end-of-list (value :init :unbound :set-trans %set-symbol-global-value - :set-known (unsafe)) + :set-known ()) ;; 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) @@ -372,27 +374,36 @@ ;; Kept here so that when the thread dies we can release the whole ;; memory we reserved. (os-address :c-type "void *" :length #!+alpha 2 #!-alpha 1) + ;; Keep these next four slots close to the beginning of the structure. + ;; Doing so reduces code size for x86-64 allocation sequences and + ;; special variable manipulations. + #!+gencgc (alloc-region :c-type "struct alloc_region" :length 5) + #!+(or x86 x86-64 sb-thread) (pseudo-atomic-bits) + (binding-stack-start :c-type "lispobj *" :length #!+alpha 2 #!-alpha 1) + (binding-stack-pointer :c-type "lispobj *" :length #!+alpha 2 #!-alpha 1) #!+sb-thread (os-attr :c-type "pthread_attr_t *" :length #!+alpha 2 #!-alpha 1) #!+sb-thread - (state-lock :c-type "pthread_mutex_t *" :length #!+alpha 2 #!-alpha 1) + (state-sem :c-type "os_sem_t *" :length #!+alpha 2 #!-alpha 1) #!+sb-thread - (state-cond :c-type "pthread_cond_t *" :length #!+alpha 2 #!-alpha 1) - (binding-stack-start :c-type "lispobj *" :length #!+alpha 2 #!-alpha 1) - (binding-stack-pointer :c-type "lispobj *" :length #!+alpha 2 #!-alpha 1) + (state-not-running-sem :c-type "os_sem_t *" :length #!+alpha 2 #!-alpha 1) + #!+sb-thread + (state-not-running-waitcount :c-type "int" :length 1) + #!+sb-thread + (state-not-stopped-sem :c-type "os_sem_t *" :length #!+alpha 2 #!-alpha 1) + #!+sb-thread + (state-not-stopped-waitcount :c-type "int" :length 1) (control-stack-start :c-type "lispobj *" :length #!+alpha 2 #!-alpha 1) (control-stack-end :c-type "lispobj *" :length #!+alpha 2 #!-alpha 1) (control-stack-guard-page-protected) (alien-stack-start :c-type "lispobj *" :length #!+alpha 2 #!-alpha 1) (alien-stack-pointer :c-type "lispobj *" :length #!+alpha 2 #!-alpha 1) - #!+gencgc (alloc-region :c-type "struct alloc_region" :length 5) (this :c-type "struct thread *" :length #!+alpha 2 #!-alpha 1) (prev :c-type "struct thread *" :length #!+alpha 2 #!-alpha 1) (next :c-type "struct thread *" :length #!+alpha 2 #!-alpha 1) ;; starting, running, suspended, dead (state :c-type "lispobj") (tls-cookie) ; on x86, the LDT index - #!+(or x86 x86-64 sb-thread) (pseudo-atomic-bits) (interrupt-data :c-type "struct interrupt_data *" :length #!+alpha 2 #!-alpha 1) (stepping)