X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fobjdef.lisp;h=d768bca63299f68e4ae771adc5905e1e2584e6b7;hb=a157ed0be79751f85b8243c06102eea95af06aa3;hp=b3839eb205f325a229fd30bb556564698089bd5e;hpb=434d132bed6f23a9bdc4e35c355cc26b9f454f20;p=sbcl.git diff --git a/src/compiler/generic/objdef.lisp b/src/compiler/generic/objdef.lisp index b3839eb..d768bca 100644 --- a/src/compiler/generic/objdef.lisp +++ b/src/compiler/generic/objdef.lisp @@ -14,9 +14,6 @@ ;;;; KLUDGE: The primitive objects here may look like self-contained ;;;; definitions, but in general they're not. In particular, if you ;;;; try to add a slot to them, beware of the following: -;;;; * (mysterious crashes which occur after changing the length -;;;; of SIMPLE-FUN, just adding a new slot not even doing anything -;;;; with it, still dunno why) ;;;; * The GC scavenging code (and for all I know other GC code too) ;;;; is not automatically generated from these layouts, but instead ;;;; was hand-written to correspond to them. The offsets are @@ -40,8 +37,10 @@ (define-primitive-object (cons :lowtag list-pointer-lowtag :alloc-trans cons) - (car :ref-trans car :set-trans sb!c::%rplaca :init :arg) - (cdr :ref-trans cdr :set-trans sb!c::%rplacd :init :arg)) + (car :ref-trans car :set-trans sb!c::%rplaca :init :arg + :cas-trans %compare-and-swap-car) + (cdr :ref-trans cdr :set-trans sb!c::%rplacd :init :arg + :cas-trans %compare-and-swap-cdr)) (define-primitive-object (instance :lowtag instance-pointer-lowtag :widetag instance-header-widetag @@ -124,11 +123,16 @@ :ref-known (flushable foldable) :set-trans (setf %array-displacement) :set-known (unsafe)) - (displaced-p :type (member t nil) + (displaced-p :type t :ref-trans %array-displaced-p :ref-known (flushable foldable) :set-trans (setf %array-displaced-p) :set-known (unsafe)) + (displaced-from :type list + :ref-trans %array-displaced-from + :ref-known (flushable) + :set-trans (setf %array-displaced-from) + :set-known (unsafe)) (dimensions :rest-p t)) (define-primitive-object (vector :type vector @@ -207,6 +211,13 @@ :ref-trans %simple-fun-type :set-known (unsafe) :set-trans (setf %simple-fun-type)) + ;; NIL for empty, STRING for a docstring, SIMPLE-VECTOR for XREFS, and (CONS + ;; STRING SIMPLE-VECTOR) for both. + (info :init :null + :ref-trans %simple-fun-info + :ref-known (flushable) + :set-trans (setf %simple-fun-info) + :set-known (unsafe)) ;; 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) @@ -221,82 +232,21 @@ (define-primitive-object (closure :lowtag fun-pointer-lowtag :widetag closure-header-widetag) (fun :init :arg :ref-trans %closure-fun) - ;; This SELF slot needs explanation. - ;; - ;; Ordinary closures did not need this slot before version 0.9.3.xx, - ;; as the closure object was already in some dedicated register -- - ;; EAX/RAX on x86(-64), reg_LEXENV on register-rich platforms -- and - ;; consequently setting up the environment (from the INFO slot, - ;; below) was easy. - ;; - ;; However, it is not easy to support calling FUNCALLABLE-INSTANCEs - ;; in the same way; in a FUNCALLABLE-INSTANCE, there are - ;; conceptually two variable-length data areas: the closure - ;; environment, if any, and the slots of the instance. - ;; - ;; Until sbcl-0.9.3.xx, it was required that closures to be set as a - ;; FUNCALLABLE-INSTANCE-FUNCTION be defined using the magical - ;; keyword SB-KERNEL:INSTANCE-LAMBDA, rather than ordinary LAMBDA; - ;; this caused an extra indirection to be compiled into the closure - ;; code to load the closure from the FUNCALLABLE-INSTANCE-LEXENV - ;; slot before setting up the environment for the function body. - ;; Failure to obey this protocol yielded confusing error messages as - ;; either INSTANCE-LAMBDAs tried to dereference environments that - ;; weren't there, or ordinary LAMBDAs got hold of the LAYOUT and - ;; LEXENV slots of a FUNCALLABLE-INSTANCE. - ;; - ;; By adding this SELF slot, which is at the same offset in a - ;; regular CLOSURE as the LEXENV slot is in a FUNCALLABLE-INSTANCE, - ;; we enable the extra indirection (VOP FUNCALLABLE-INSTANCE-LEXENV, - ;; in src/compiler/ir2tran.lisp) to be compiled unconditionally - ;; (provided that we set this slot to the closure object itself). - ;; Relative to the code before, this adds a word to the space - ;; requirements of a closure, and one instruction (a memory fetch) - ;; to the body of a closure function. - ;; - ;; There are potentially other implementation strategies which would - ;; remove the need for this extra indirection in regular closures, - ;; such as setting up a trampoline for funcallable instances (though - ;; it was not clear to me that there are enough registers free in - ;; the x86 backend to permit this). This indirection should not be - ;; too disastrous, given that for regular closures the fetch is from - ;; memory which is known to be active. - ;; - ;; CSR, 2005-08-05 - (self) ; KLUDGE (see above comment) (info :rest-p t)) (define-primitive-object (funcallable-instance :lowtag fun-pointer-lowtag :widetag funcallable-instance-header-widetag :alloc-trans %make-funcallable-instance) - #!-(or x86 x86-64) - (fun - :ref-known (flushable) :ref-trans %funcallable-instance-fun - :set-known (unsafe) :set-trans (setf %funcallable-instance-fun)) - #!+(or x86 x86-64) - (fun - :ref-known (flushable) :ref-trans %funcallable-instance-fun - ;; KLUDGE: There's no :SET-KNOWN or :SET-TRANS in this case. - ;; Instead, later in compiler/x86/system.lisp there's a separate - ;; DEFKNOWN for (SETF %FUNCALLABLE-INSTANCE-FUN), and a weird - ;; unexplained DEFTRANSFORM from (SETF %SIMPLE-FUN-INSTANCE-FUN) - ;; into (SETF %SIMPLE-FUN-SELF). The #!+X86 wrapped around this case - ;; is a literal translation of the old CMU CL implementation into - ;; the new world of sbcl-0.6.12.63, where multiple DEFKNOWNs for - ;; the same operator cause an error (instead of silently deleting - ;; all information associated with the old DEFKNOWN, as before). - ;; It's definitely not very clean, with too many #!+ conditionals and - ;; too little documentation, but I have more urgent things to - ;; clean up right now, so I've just left it as a literal - ;; translation without trying to fix it. -- WHN 2001-08-02 - ) - (lexenv :ref-known (flushable) :ref-trans %funcallable-instance-lexenv - :set-known (unsafe) :set-trans (setf %funcallable-instance-lexenv)) + (trampoline :init :funcallable-instance-tramp) + (function :ref-known (flushable) :ref-trans %funcallable-instance-function + :set-known (unsafe) :set-trans (setf %funcallable-instance-function)) (info :rest-p t)) (define-primitive-object (value-cell :lowtag other-pointer-lowtag :widetag value-cell-header-widetag + ;; FIXME: We also have an explicit VOP + ;; for this. Is this needed as well? :alloc-trans make-value-cell) (value :set-trans value-cell-set :set-known (unsafe) @@ -337,16 +287,19 @@ (current-uwp :c-type #!-alpha "struct unwind_block *" #!+alpha "u32") (current-cont :c-type #!-alpha "lispobj *" #!+alpha "u32") #!-(or x86 x86-64) current-code - entry-pc) + entry-pc + #!+win32 next-seh-frame + #!+win32 seh-frame-handler) (define-primitive-object (catch-block) (current-uwp :c-type #!-alpha "struct unwind_block *" #!+alpha "u32") (current-cont :c-type #!-alpha "lispobj *" #!+alpha "u32") #!-(or x86 x86-64) current-code entry-pc + #!+win32 next-seh-frame + #!+win32 seh-frame-handler tag - (previous-catch :c-type #!-alpha "struct catch_block *" #!+alpha "u32") - size) + (previous-catch :c-type #!-alpha "struct catch_block *" #!+alpha "u32")) ;;; (For an explanation of this, see the comments at the definition of ;;; KLUDGE-NONDETERMINISTIC-CATCH-BLOCK-SIZE.) @@ -368,13 +321,17 @@ ;; first data slot, and if you subtract 7 you get a symbol header. ;; also the CAR of NIL-as-end-of-list - (value :init :unbound :ref-known (flushable) :ref-trans symbol-global-value) + (value :init :unbound + :set-trans %set-symbol-global-value + :set-known (unsafe)) ;; 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 + :cas-trans %compare-and-swap-symbol-plist + :type list :init :null) (name :ref-trans symbol-name :init :arg) (package :ref-trans symbol-package @@ -385,17 +342,21 @@ (define-primitive-object (complex-single-float :lowtag other-pointer-lowtag :widetag complex-single-float-widetag) + #!+x86-64 + (data :c-type "struct { float data[2]; } ") + #!-x86-64 (real :c-type "float") + #!-x86-64 (imag :c-type "float")) (define-primitive-object (complex-double-float :lowtag other-pointer-lowtag :widetag complex-double-float-widetag) - #!-x86-64 (filler) + (filler) (real :c-type "double" :length #!-x86-64 2 #!+x86-64 1) (imag :c-type "double" :length #!-x86-64 2 #!+x86-64 1)) -#!+sb-lutex +#!+(and sb-lutex sb-thread) (define-primitive-object (lutex :lowtag other-pointer-lowtag :widetag lutex-widetag @@ -406,6 +367,8 @@ (prev :c-type "struct lutex *" :length 1) (mutex :c-type "pthread_mutex_t *" :length 1) + (mutexattr :c-type "pthread_mutexattr_t *" + :length 1) (condition-variable :c-type "pthread_cond_t *" :length 1)) @@ -421,11 +384,23 @@ ;; tls[0] = NO_TLS_VALUE_MARKER_WIDETAG because a the tls index slot ;; of a symbol is initialized to zero (no-tls-value-marker) - (os-thread :c-type "volatile os_thread_t") + (os-thread :c-type "os_thread_t") + ;; This is the original address at which the memory was allocated, + ;; which may have different alignment then what we prefer to use. + ;; 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) + #!+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) + #!+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) (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) @@ -433,10 +408,16 @@ (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 "volatile lispobj") + (state :c-type "lispobj") (tls-cookie) ; on x86, the LDT index - #!+(or x86 x86-64) (pseudo-atomic-atomic) - #!+(or x86 x86-64) (pseudo-atomic-interrupted) + #!+(or x86 x86-64) (pseudo-atomic-bits) (interrupt-data :c-type "struct interrupt_data *" :length #!+alpha 2 #!-alpha 1) + (stepping) + ;; KLUDGE: On alpha, until STEPPING we have been lucky and the 32 + ;; bit slots came in pairs. However the C compiler will align + ;; interrupt_contexts on a double word boundary. This logic should + ;; be handled by DEFINE-PRIMITIVE-OBJECT. + #!+alpha + (padding) (interrupt-contexts :c-type "os_context_t *" :rest-p t))