From c9ace3ddc0e83bc6bd7d65054c0a479d42e3a62c Mon Sep 17 00:00:00 2001 From: Douglas Katzman Date: Sun, 16 Apr 2017 10:48:19 -0400 Subject: [PATCH] Remove "-HEADER-" from SYMBOL and VALUE-CELL widetag names --- contrib/sb-introspect/introspect.lisp | 4 ++-- contrib/stale-symbols.lisp | 2 +- package-data-list.lisp-expr | 4 ++-- src/code/class.lisp | 2 +- src/code/debug-int.lisp | 2 +- src/code/print.lisp | 2 +- src/code/room.lisp | 4 ++-- src/compiler/alpha/alloc.lisp | 2 +- src/compiler/alpha/type-vops.lisp | 2 +- src/compiler/arm/alloc.lisp | 2 +- src/compiler/arm/type-vops.lisp | 2 +- src/compiler/arm64/alloc.lisp | 2 +- src/compiler/arm64/type-vops.lisp | 2 +- src/compiler/generic/early-objdef.lisp | 4 ++-- src/compiler/generic/genesis.lisp | 8 ++++---- src/compiler/generic/late-objdef.lisp | 4 ++-- src/compiler/generic/objdef.lisp | 4 ++-- src/compiler/generic/vm-type.lisp | 4 ++-- src/compiler/hppa/alloc.lisp | 2 +- src/compiler/hppa/type-vops.lisp | 2 +- src/compiler/mips/alloc.lisp | 2 +- src/compiler/mips/type-vops.lisp | 4 ++-- src/compiler/ppc/alloc.lisp | 2 +- src/compiler/ppc/type-vops.lisp | 2 +- src/compiler/sparc/alloc.lisp | 2 +- src/compiler/sparc/type-vops.lisp | 2 +- src/compiler/x86-64/alloc.lisp | 2 +- src/compiler/x86-64/type-vops.lisp | 2 +- src/compiler/x86/alloc.lisp | 2 +- src/compiler/x86/type-vops.lisp | 2 +- src/runtime/backtrace.c | 2 +- src/runtime/coreparse.c | 2 +- src/runtime/gc-common.c | 2 +- src/runtime/marknsweepgc.c | 10 +++++----- src/runtime/print.c | 8 ++++---- src/runtime/purify.c | 4 ++-- src/runtime/search.c | 2 +- tests/compiler-test-util.lisp | 2 +- 38 files changed, 57 insertions(+), 57 deletions(-) diff --git a/contrib/sb-introspect/introspect.lisp b/contrib/sb-introspect/introspect.lisp index 9f5b75762..7862f9dd9 100644 --- a/contrib/sb-introspect/introspect.lisp +++ b/contrib/sb-introspect/introspect.lisp @@ -992,8 +992,8 @@ Experimental: interface subject to change." (call (symbol-package object)))) (sb-kernel::random-class (case (sb-kernel:widetag-of object) - (#.sb-vm::value-cell-header-widetag - (call (sb-kernel::value-cell-ref object))) + (#.sb-vm:value-cell-widetag + (call (sb-kernel:value-cell-ref object))) (t (warn "~&MAP-ROOT: Unknown widetag ~S: ~S~%" (sb-kernel:widetag-of object) object))))))) diff --git a/contrib/stale-symbols.lisp b/contrib/stale-symbols.lisp index 2a0b7c1e4..252243dc4 100644 --- a/contrib/stale-symbols.lisp +++ b/contrib/stale-symbols.lisp @@ -66,7 +66,7 @@ (declare (optimize (safety 0)) (ignore size)) (block mapper - (when (eql type sb-vm:symbol-header-widetag) + (when (eql type sb-vm:symbol-widetag) (ignore-errors (let ((refs (let ((res nil) (count 0)) diff --git a/package-data-list.lisp-expr b/package-data-list.lisp-expr index 35963bd3a..bb217d09b 100644 --- a/package-data-list.lisp-expr +++ b/package-data-list.lisp-expr @@ -3146,7 +3146,7 @@ structure representations" "SLOT-REST-P" "*STATIC-FUNS*" "STATIC-FUN-OFFSET" "STATIC-SYMBOL-OFFSET" "STATIC-SYMBOL-P" "*STATIC-SPACE-FREE-POINTER*" "*STATIC-SYMBOLS*" - "SYMBOL-HASH-SLOT" "SYMBOL-HEADER-WIDETAG" "SYMBOL-NAME-SLOT" + "SYMBOL-HASH-SLOT" "SYMBOL-WIDETAG" "SYMBOL-NAME-SLOT" "SYMBOL-PACKAGE-SLOT" "SYMBOL-INFO-SLOT" "SYMBOL-SIZE" "SYMBOL-VALUE-SLOT" "SYMBOL-TLS-INDEX-SLOT" "*BINDING-STACK-START*" @@ -3176,7 +3176,7 @@ structure representations" "UNSIGNED-REG-SC-NUMBER" "UNSIGNED-STACK-SC-NUMBER" "UNWIND-BLOCK-CODE-SLOT" "UNWIND-BLOCK-CFP-SLOT" "UNWIND-BLOCK-UWP-SLOT" "UNWIND-BLOCK-ENTRY-PC-SLOT" - "UNWIND-BLOCK-SIZE" "VALUE-CELL-HEADER-WIDETAG" "VALUE-CELL-SIZE" + "UNWIND-BLOCK-SIZE" "VALUE-CELL-WIDETAG" "VALUE-CELL-SIZE" "VALUE-CELL-VALUE-SLOT" "VECTOR-DATA-OFFSET" "VECTOR-LENGTH-SLOT" "VECTOR-NORMAL-SUBTYPE" "VECTOR-VALID-HASHING-SUBTYPE" diff --git a/src/code/class.lisp b/src/code/class.lisp index 7a10851e9..115af265e 100644 --- a/src/code/class.lisp +++ b/src/code/class.lisp @@ -868,7 +868,7 @@ between the ~A definition and the ~A definition" (character :codes (#.sb!vm:character-widetag) :translation (character-set) :prototype-form (code-char 42)) - (symbol :codes (#.sb!vm:symbol-header-widetag) + (symbol :codes (#.sb!vm:symbol-widetag) :prototype-form '#:mu) (system-area-pointer :codes (#.sb!vm:sap-widetag) diff --git a/src/code/debug-int.lisp b/src/code/debug-int.lisp index f70e9c53a..95a62fee4 100644 --- a/src/code/debug-int.lisp +++ b/src/code/debug-int.lisp @@ -2448,7 +2448,7 @@ register." ;;; indirection cell. (defun indirect-value-cell-p (x) (and (%other-pointer-p x) - (eql (%other-pointer-widetag x) sb!vm:value-cell-header-widetag))) + (eql (%other-pointer-widetag x) sb!vm:value-cell-widetag))) ;;; Return three values reflecting the validity of DEBUG-VAR's value ;;; at BASIC-CODE-LOCATION: diff --git a/src/code/print.lisp b/src/code/print.lisp index c03a328c2..2c10028d6 100644 --- a/src/code/print.lisp +++ b/src/code/print.lisp @@ -1677,7 +1677,7 @@ variable: an unreadable object representing the error is printed instead.") (#.sb!vm:other-pointer-lowtag (let ((widetag (widetag-of object))) (case widetag - (#.sb!vm:value-cell-header-widetag + (#.sb!vm:value-cell-widetag (write-string "value cell " stream) (output-object (value-cell-ref object) stream)) (t diff --git a/src/code/room.lisp b/src/code/room.lisp index b72c8f13a..480374bf4 100644 --- a/src/code/room.lisp +++ b/src/code/room.lisp @@ -364,7 +364,7 @@ ;; Static space starts with NIL, which requires special ;; handling, as the header and alignment are slightly off. (multiple-value-bind (start end) (space-bounds space) - (funcall fun nil symbol-header-widetag (* 8 n-word-bytes)) + (funcall fun nil symbol-widetag (* 8 n-word-bytes)) (map-objects-in-range fun (%make-lisp-obj (+ (* 8 n-word-bytes) (sap-int start))) @@ -712,7 +712,7 @@ (if dinfo (sb!c::compiled-debug-info-name dinfo) "No debug info.")))) - (#.symbol-header-widetag + (#.symbol-widetag (format stream "~&~S~%" obj)) (#.list-pointer-lowtag (unless (gethash obj printed-conses) diff --git a/src/compiler/alpha/alloc.lisp b/src/compiler/alpha/alloc.lisp index f4c77b8b2..2ac2f0090 100644 --- a/src/compiler/alpha/alloc.lisp +++ b/src/compiler/alpha/alloc.lisp @@ -145,7 +145,7 @@ (:results (result :scs (descriptor-reg))) (:generator 10 (with-fixed-allocation - (result temp value-cell-header-widetag value-cell-size) + (result temp value-cell-widetag value-cell-size) (storew value result value-cell-value-slot other-pointer-lowtag)))) ;;;; automatic allocators for primitive objects diff --git a/src/compiler/alpha/type-vops.lisp b/src/compiler/alpha/type-vops.lisp index 25030f834..e4815f483 100644 --- a/src/compiler/alpha/type-vops.lisp +++ b/src/compiler/alpha/type-vops.lisp @@ -174,7 +174,7 @@ (:generator 12 (inst cmpeq value null-tn temp) (inst bne temp (if not-p drop-thru target)) - (test-type value target not-p (symbol-header-widetag) :temp temp) + (test-type value target not-p (symbol-widetag) :temp temp) DROP-THRU)) (define-vop (consp type-predicate) diff --git a/src/compiler/arm/alloc.lisp b/src/compiler/arm/alloc.lisp index 8c86e099f..8c31166a8 100644 --- a/src/compiler/arm/alloc.lisp +++ b/src/compiler/arm/alloc.lisp @@ -140,7 +140,7 @@ (:info stack-allocate-p) (:results (result :scs (descriptor-reg))) (:generator 10 - (with-fixed-allocation (result pa-flag value-cell-header-widetag + (with-fixed-allocation (result pa-flag value-cell-widetag value-cell-size :stack-allocate-p stack-allocate-p) (storew value result value-cell-value-slot other-pointer-lowtag)))) diff --git a/src/compiler/arm/type-vops.lisp b/src/compiler/arm/type-vops.lisp index a49c136f3..b48da2703 100644 --- a/src/compiler/arm/type-vops.lisp +++ b/src/compiler/arm/type-vops.lisp @@ -327,7 +327,7 @@ (is-symbol-label (if not-p drop-thru target))) (inst cmp value null-tn) (inst b :eq is-symbol-label) - (test-type value target not-p (symbol-header-widetag) :temp temp) + (test-type value target not-p (symbol-widetag) :temp temp) (emit-label drop-thru)))) (define-vop (consp type-predicate) diff --git a/src/compiler/arm64/alloc.lisp b/src/compiler/arm64/alloc.lisp index ec3b02003..3745607eb 100644 --- a/src/compiler/arm64/alloc.lisp +++ b/src/compiler/arm64/alloc.lisp @@ -140,7 +140,7 @@ (:info stack-allocate-p) (:results (result :scs (descriptor-reg))) (:generator 10 - (with-fixed-allocation (result pa-flag value-cell-header-widetag + (with-fixed-allocation (result pa-flag value-cell-widetag value-cell-size :stack-allocate-p stack-allocate-p :lip lip) (storew value result value-cell-value-slot other-pointer-lowtag)))) diff --git a/src/compiler/arm64/type-vops.lisp b/src/compiler/arm64/type-vops.lisp index 5ce5748c6..4084ba1a8 100644 --- a/src/compiler/arm64/type-vops.lisp +++ b/src/compiler/arm64/type-vops.lisp @@ -357,7 +357,7 @@ (is-symbol-label (if not-p drop-thru target))) (inst cmp value null-tn) (inst b :eq is-symbol-label) - (test-type value target not-p (symbol-header-widetag) :temp temp) + (test-type value target not-p (symbol-widetag) :temp temp) (emit-label drop-thru)))) (define-vop (consp type-predicate) diff --git a/src/compiler/generic/early-objdef.lisp b/src/compiler/generic/early-objdef.lisp index a647a5375..0dd35dc89 100644 --- a/src/compiler/generic/early-objdef.lisp +++ b/src/compiler/generic/early-objdef.lisp @@ -193,8 +193,8 @@ #!-(or x86 x86-64) return-pc-header-widetag ; 36 3D 36 3D - value-cell-header-widetag ; 3A 41 3A 41 - symbol-header-widetag ; 3E 45 3E 45 + value-cell-widetag ; 3A 41 3A 41 + symbol-widetag ; 3E 45 3E 45 character-widetag ; 42 49 42 49 sap-widetag ; 46 4D 46 4D unbound-marker-widetag ; 4A 51 4A 51 diff --git a/src/compiler/generic/genesis.lisp b/src/compiler/generic/genesis.lisp index 15766f4fa..83553aea2 100644 --- a/src/compiler/generic/genesis.lisp +++ b/src/compiler/generic/genesis.lisp @@ -941,7 +941,7 @@ core and return a descriptor to it." (defun allocate-symbol (name &key (gspace (symbol-value *cold-symbol-gspace*))) (declare (simple-string name)) (let ((symbol (allocate-header+object gspace (1- sb!vm:symbol-size) - sb!vm:symbol-header-widetag))) + sb!vm:symbol-widetag))) (write-wordindexed symbol sb!vm:symbol-value-slot *unbound-marker*) (write-wordindexed symbol sb!vm:symbol-hash-slot (make-fixnum-descriptor 0)) (write-wordindexed symbol sb!vm:symbol-info-slot *nil-descriptor*) @@ -1596,7 +1596,7 @@ core and return a descriptor to it." 1 (make-other-immediate-descriptor 0 - sb!vm:symbol-header-widetag)) + sb!vm:symbol-widetag)) (write-wordindexed des (+ 1 sb!vm:symbol-value-slot) result) @@ -2782,7 +2782,7 @@ core and return a descriptor to it." (cons (recurse (cold-car x)) (recurse (cold-cdr x)))) (#.sb!vm:other-pointer-lowtag (ecase (logand (descriptor-bits (read-memory x)) sb!vm:widetag-mask) - (#.sb!vm:symbol-header-widetag + (#.sb!vm:symbol-widetag (if (cold-null (read-wordindexed x sb!vm:symbol-package-slot)) (get-or-make-uninterned-symbol (base-string-from-core @@ -3901,7 +3901,7 @@ initially undefined function references:~2%") (let ((widetag (logand (descriptor-bits (read-memory x)) sb!vm:widetag-mask))) (ecase widetag - (#.sb!vm:symbol-header-widetag + (#.sb!vm:symbol-widetag (if strictp (warm-symbol x) (or (gethash (descriptor-bits x) *cold-symbols*) ; first try diff --git a/src/compiler/generic/late-objdef.lisp b/src/compiler/generic/late-objdef.lisp index e8e62e153..4177e9f2f 100644 --- a/src/compiler/generic/late-objdef.lisp +++ b/src/compiler/generic/late-objdef.lisp @@ -53,8 +53,8 @@ ;; These have a scav and trans function, but no size function. #!-(or x86 x86-64) (return-pc-header "return_pc_header" "return_pc_header" "lose") - (value-cell-header "boxed") - (symbol-header "tiny_boxed") + (value-cell "boxed") + (symbol "tiny_boxed") (character "immediate") (sap "unboxed") (unbound-marker "immediate") diff --git a/src/compiler/generic/objdef.lisp b/src/compiler/generic/objdef.lisp index c7f85c5f0..2f8e16d48 100644 --- a/src/compiler/generic/objdef.lisp +++ b/src/compiler/generic/objdef.lisp @@ -256,7 +256,7 @@ (info :rest-p t)) (!define-primitive-object (value-cell :lowtag other-pointer-lowtag - :widetag value-cell-header-widetag + :widetag value-cell-widetag ;; FIXME: We also have an explicit VOP ;; for this. Is this needed as well? :alloc-trans make-value-cell) @@ -306,7 +306,7 @@ ;;;; symbols (!define-primitive-object (symbol :lowtag other-pointer-lowtag - :widetag symbol-header-widetag + :widetag symbol-widetag :alloc-trans %%make-symbol :type symbol) diff --git a/src/compiler/generic/vm-type.lisp b/src/compiler/generic/vm-type.lisp index ee476e10a..10d85999c 100644 --- a/src/compiler/generic/vm-type.lisp +++ b/src/compiler/generic/vm-type.lisp @@ -335,13 +335,13 @@ (list (sb!vm:saetp-typecode saetp))))))))) ((classoid-p x) (case (classoid-name x) - (symbol sb!vm:symbol-header-widetag) ; plus a hack for nil + (symbol sb!vm:symbol-widetag) ; plus a hack for nil (system-area-pointer sb!vm:sap-widetag)))))) (cond ((not adjunct) (push x remainder)) ((listp adjunct) (setq widetags (nconc adjunct widetags))) (t (push adjunct widetags))))) (let ((remainder (nreverse remainder))) - (when (member sb!vm:symbol-header-widetag widetags) + (when (member sb!vm:symbol-widetag widetags) ;; If symbol is the only widetag-testable type, it's better ;; to just use symbolp. e.g. (OR SYMBOL CHARACTER) should not ;; become (OR (%OTHER-POINTER-SUBTYPE-P ...) diff --git a/src/compiler/hppa/alloc.lisp b/src/compiler/hppa/alloc.lisp index 3d97f4bfe..01b37bf94 100644 --- a/src/compiler/hppa/alloc.lisp +++ b/src/compiler/hppa/alloc.lisp @@ -183,7 +183,7 @@ (:info stack-allocate-p) (:generator 10 (with-fixed-allocation - (result nil temp value-cell-header-widetag value-cell-size stack-allocate-p) + (result nil temp value-cell-widetag value-cell-size stack-allocate-p) (storew value result value-cell-value-slot other-pointer-lowtag)))) ;;;; Automatic allocators for primitive objects. diff --git a/src/compiler/hppa/type-vops.lisp b/src/compiler/hppa/type-vops.lisp index 3ebb22840..9df3ab88f 100644 --- a/src/compiler/hppa/type-vops.lisp +++ b/src/compiler/hppa/type-vops.lisp @@ -148,7 +148,7 @@ (:translate symbolp) (:generator 12 (inst bc := nil value null-tn (if not-p drop-thru target)) - (test-type value target not-p (symbol-header-widetag) :temp temp) + (test-type value target not-p (symbol-widetag) :temp temp) DROP-THRU)) (define-vop (consp type-predicate) diff --git a/src/compiler/mips/alloc.lisp b/src/compiler/mips/alloc.lisp index 12b01e9d4..6dfb81953 100644 --- a/src/compiler/mips/alloc.lisp +++ b/src/compiler/mips/alloc.lisp @@ -203,7 +203,7 @@ (:info stack-allocate-p) (:results (result :scs (descriptor-reg))) (:generator 10 - (with-fixed-allocation (result pa-flag temp value-cell-header-widetag + (with-fixed-allocation (result pa-flag temp value-cell-widetag value-cell-size stack-allocate-p) (storew value result value-cell-value-slot other-pointer-lowtag)))) diff --git a/src/compiler/mips/type-vops.lisp b/src/compiler/mips/type-vops.lisp index 67cf444c7..f8b059518 100644 --- a/src/compiler/mips/type-vops.lisp +++ b/src/compiler/mips/type-vops.lisp @@ -179,7 +179,7 @@ ;;; Because of our LOWTAG representation, SYMBOLP and CONSP are ;;; slightly more complex: ;;; -;;; * SYMBOLP is true if the object has SYMBOL-HEADER-WIDETAG or is EQ +;;; * SYMBOLP is true if the object has SYMBOL-WIDETAG or is EQ ;;; to NIL; ;;; ;;; * CONSP is true if the object has LIST-POINTER-LOWTAG and is not @@ -191,7 +191,7 @@ (:translate symbolp) (:generator 12 (inst beq value null-tn (if not-p drop-thru target)) - (test-type value target not-p (symbol-header-widetag) :temp temp) + (test-type value target not-p (symbol-widetag) :temp temp) DROP-THRU)) (define-vop (consp type-predicate) diff --git a/src/compiler/ppc/alloc.lisp b/src/compiler/ppc/alloc.lisp index d890ab0c0..06aebeca0 100644 --- a/src/compiler/ppc/alloc.lisp +++ b/src/compiler/ppc/alloc.lisp @@ -154,7 +154,7 @@ (:ignore stack-allocate-p) (:results (result :scs (descriptor-reg))) (:generator 10 - (with-fixed-allocation (result pa-flag temp value-cell-header-widetag value-cell-size) + (with-fixed-allocation (result pa-flag temp value-cell-widetag value-cell-size) (storew value result value-cell-value-slot other-pointer-lowtag)))) diff --git a/src/compiler/ppc/type-vops.lisp b/src/compiler/ppc/type-vops.lisp index 8b08c5eec..59003b962 100644 --- a/src/compiler/ppc/type-vops.lisp +++ b/src/compiler/ppc/type-vops.lisp @@ -184,7 +184,7 @@ (is-symbol-label (if not-p drop-thru target))) (inst cmpw value null-tn) (inst beq is-symbol-label) - (test-type value target not-p (symbol-header-widetag) :temp temp) + (test-type value target not-p (symbol-widetag) :temp temp) (emit-label drop-thru)))) (define-vop (consp type-predicate) diff --git a/src/compiler/sparc/alloc.lisp b/src/compiler/sparc/alloc.lisp index 34c80e7d7..d58bcb075 100644 --- a/src/compiler/sparc/alloc.lisp +++ b/src/compiler/sparc/alloc.lisp @@ -142,7 +142,7 @@ (:results (result :scs (descriptor-reg))) (:generator 10 (with-fixed-allocation - (result temp value-cell-header-widetag value-cell-size) + (result temp value-cell-widetag value-cell-size) (storew value result value-cell-value-slot other-pointer-lowtag)))) ;;;; Automatic allocators for primitive objects. diff --git a/src/compiler/sparc/type-vops.lisp b/src/compiler/sparc/type-vops.lisp index 63108acfb..558714c8f 100644 --- a/src/compiler/sparc/type-vops.lisp +++ b/src/compiler/sparc/type-vops.lisp @@ -217,7 +217,7 @@ (is-symbol-label (if not-p drop-thru target))) (inst cmp value null-tn) (inst b :eq is-symbol-label) - (test-type value target not-p (symbol-header-widetag) :temp temp) + (test-type value target not-p (symbol-widetag) :temp temp) (emit-label drop-thru)))) (define-vop (consp type-predicate) diff --git a/src/compiler/x86-64/alloc.lisp b/src/compiler/x86-64/alloc.lisp index 8952927fa..3fecf82bf 100644 --- a/src/compiler/x86-64/alloc.lisp +++ b/src/compiler/x86-64/alloc.lisp @@ -304,7 +304,7 @@ (:node-var node) (:generator 10 (with-fixed-allocation - (result value-cell-header-widetag value-cell-size node stack-allocate-p) + (result value-cell-widetag value-cell-size node stack-allocate-p) (storew value result value-cell-value-slot other-pointer-lowtag)))) ;;;; automatic allocators for primitive objects diff --git a/src/compiler/x86-64/type-vops.lisp b/src/compiler/x86-64/type-vops.lisp index 7864e7963..6384fdd39 100644 --- a/src/compiler/x86-64/type-vops.lisp +++ b/src/compiler/x86-64/type-vops.lisp @@ -380,7 +380,7 @@ (let ((is-symbol-label (if not-p DROP-THRU target))) (inst cmp value nil-value) (inst jmp :e is-symbol-label) - (test-type value target not-p (symbol-header-widetag))) + (test-type value target not-p (symbol-widetag))) DROP-THRU)) (define-vop (consp type-predicate) diff --git a/src/compiler/x86/alloc.lisp b/src/compiler/x86/alloc.lisp index d9d44cf38..09a919fe1 100644 --- a/src/compiler/x86/alloc.lisp +++ b/src/compiler/x86/alloc.lisp @@ -190,7 +190,7 @@ (:node-var node) (:generator 10 (with-fixed-allocation - (result value-cell-header-widetag value-cell-size node stack-allocate-p) + (result value-cell-widetag value-cell-size node stack-allocate-p) (storew value result value-cell-value-slot other-pointer-lowtag)))) ;;;; automatic allocators for primitive objects diff --git a/src/compiler/x86/type-vops.lisp b/src/compiler/x86/type-vops.lisp index 08edef96d..cab286136 100644 --- a/src/compiler/x86/type-vops.lisp +++ b/src/compiler/x86/type-vops.lisp @@ -337,7 +337,7 @@ (inst jmp :e is-symbol-label) (inst test al-tn other-pointer-lowtag) (inst jmp :nz (if not-p target drop-thru)) - (inst cmp widetag-tn symbol-header-widetag) + (inst cmp widetag-tn symbol-widetag) (inst jmp (if not-p :ne :e) target)) DROP-THRU)) diff --git a/src/runtime/backtrace.c b/src/runtime/backtrace.c index d1eecb1ce..91a3ee4cc 100644 --- a/src/runtime/backtrace.c +++ b/src/runtime/backtrace.c @@ -167,7 +167,7 @@ print_entry_name (lispobj name) putchar(')'); } else if (lowtag_of(name) == OTHER_POINTER_LOWTAG) { lispobj *object = native_pointer(name); - if (widetag_of(*object) == SYMBOL_HEADER_WIDETAG) { + if (widetag_of(*object) == SYMBOL_WIDETAG) { struct symbol *symbol = (struct symbol *) object; if (symbol->package != NIL) { struct package *pkg diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c index 118924de7..34b34e065 100644 --- a/src/runtime/coreparse.c +++ b/src/runtime/coreparse.c @@ -579,7 +579,7 @@ os_vm_address_t get_asm_routine_by_name(const char* name) for (i=2 ; i < fixnum_value(table->length) ; i += 2) { sym = table->data[i]; if (lowtag_of(sym) == OTHER_POINTER_LOWTAG - && widetag_of(SYMBOL(sym)->header) == SYMBOL_HEADER_WIDETAG + && widetag_of(SYMBOL(sym)->header) == SYMBOL_WIDETAG && !strcmp(name, (char*)((struct vector*) native_pointer(SYMBOL(sym)->name))->data)) diff --git a/src/runtime/gc-common.c b/src/runtime/gc-common.c index a120c2e0b..152e9c0bd 100644 --- a/src/runtime/gc-common.c +++ b/src/runtime/gc-common.c @@ -1126,7 +1126,7 @@ scav_hash_table_entries (struct hash_table *hash_table) empty_symbol = kv_vector[1]; /* fprintf(stderr,"* empty_symbol = %x\n", empty_symbol);*/ - if (widetag_of(*native_pointer(empty_symbol)) != SYMBOL_HEADER_WIDETAG) { + if (widetag_of(*native_pointer(empty_symbol)) != SYMBOL_WIDETAG) { lose("not a symbol where empty-hash-table-slot symbol expected: %x\n", *native_pointer(empty_symbol)); } diff --git a/src/runtime/marknsweepgc.c b/src/runtime/marknsweepgc.c index 924a65e8e..fec17316c 100644 --- a/src/runtime/marknsweepgc.c +++ b/src/runtime/marknsweepgc.c @@ -1506,7 +1506,7 @@ lispobj alloc_sym(lispobj name) alloc_immobile_obj(MAKE_ATTR(CEILING(SYMBOL_SIZE,2), // spacing CEILING(SYMBOL_SIZE,2), // size 0), - (SYMBOL_SIZE-1)<<8 | SYMBOL_HEADER_WIDETAG, + (SYMBOL_SIZE-1)<<8 | SYMBOL_WIDETAG, &symbol_page_hint); s->value = UNBOUND_MARKER_WIDETAG; s->hash = 0; @@ -1782,8 +1782,8 @@ static void fixup_space(lispobj* where, size_t n_words) case COMPLEX_VECTOR_WIDETAG: case COMPLEX_ARRAY_WIDETAG: // And the other entirely boxed objects. - case SYMBOL_HEADER_WIDETAG: - case VALUE_CELL_HEADER_WIDETAG: + case SYMBOL_WIDETAG: + case VALUE_CELL_WIDETAG: case WEAK_POINTER_WIDETAG: case RATIO_WIDETAG: case COMPLEX_WIDETAG: @@ -1894,7 +1894,7 @@ void defrag_immobile_space(int* components) for ( ; obj < limit ; obj = (lispobj*)((char*)obj + obj_spacing) ) { lispobj word = *obj; if (!fixnump(word)) { - if (widetag_of(word) == SYMBOL_HEADER_WIDETAG) + if (widetag_of(word) == SYMBOL_WIDETAG) ++sym_kind_histo[classify_symbol(obj)]; else ++obj_type_histo[widetag_of(word)/4]; @@ -2008,7 +2008,7 @@ void defrag_immobile_space(int* components) case FDEFN_WIDETAG: alloc_ptr = &fdefn_alloc_ptr; break; - case SYMBOL_HEADER_WIDETAG: + case SYMBOL_WIDETAG: alloc_ptr = &symbol_alloc_ptr[classify_symbol(obj)]; break; default: diff --git a/src/runtime/print.c b/src/runtime/print.c index 9d7eef0b2..c0f4208ba 100644 --- a/src/runtime/print.c +++ b/src/runtime/print.c @@ -547,7 +547,7 @@ static void brief_otherptr(lispobj obj) header = *ptr; type = widetag_of(header); switch (type) { - case SYMBOL_HEADER_WIDETAG: + case SYMBOL_WIDETAG: symbol = (struct symbol *)ptr; if (symbol->package == NIL) printf("#:"); @@ -569,7 +569,7 @@ static void brief_otherptr(lispobj obj) // FIXME: more address validity checks perhaps? lispobj name = ((struct fdefn*)ptr)->name; if (lowtag_of(name) == OTHER_POINTER_LOWTAG - && widetag_of(*native_pointer(name)) == SYMBOL_HEADER_WIDETAG) { + && widetag_of(*native_pointer(name)) == SYMBOL_WIDETAG) { printf(" for "); struct vector* str = symbol_name(native_pointer(name)); safely_show_lstring(str, 0, stdout); @@ -698,7 +698,7 @@ static void print_otherptr(lispobj obj) print_slots(complex_slots, count, ptr); break; - case SYMBOL_HEADER_WIDETAG: + case SYMBOL_WIDETAG: // Only 1 byte of a symbol header conveys its size. // The other bytes may be freely used by the backend. print_slots(symbol_slots, count & 0xFF, ptr); @@ -825,7 +825,7 @@ static void print_otherptr(lispobj obj) count & SHORT_HEADER_MAX_WORDS, ptr); break; - case VALUE_CELL_HEADER_WIDETAG: + case VALUE_CELL_WIDETAG: print_slots(value_cell_slots, 1, ptr); break; diff --git a/src/runtime/purify.c b/src/runtime/purify.c index 1efbec8e8..6990d5710 100644 --- a/src/runtime/purify.c +++ b/src/runtime/purify.c @@ -420,11 +420,11 @@ ptrans_otherptr(lispobj thing, lispobj header, boolean constant) case COMPLEX_ARRAY_WIDETAG: return ptrans_boxed(thing, header, constant); - case VALUE_CELL_HEADER_WIDETAG: + case VALUE_CELL_WIDETAG: case WEAK_POINTER_WIDETAG: return ptrans_boxed(thing, header, 0); - case SYMBOL_HEADER_WIDETAG: + case SYMBOL_WIDETAG: return ptrans_boxed(thing, header, 0); #include "genesis/specialized-vectors.inc" diff --git a/src/runtime/search.c b/src/runtime/search.c index 12322cfda..e1b07d470 100644 --- a/src/runtime/search.c +++ b/src/runtime/search.c @@ -57,7 +57,7 @@ boolean search_for_symbol(char *name, lispobj **start, int *count) struct vector *symbol_name; int namelen = strlen(name); - while (search_for_type(SYMBOL_HEADER_WIDETAG, start, count)) { + while (search_for_type(SYMBOL_WIDETAG, start, count)) { symbol = (struct symbol *)native_pointer((lispobj)*start); if (lowtag_of(symbol->name) == OTHER_POINTER_LOWTAG) { symbol_name = (struct vector *)native_pointer(symbol->name); diff --git a/tests/compiler-test-util.lisp b/tests/compiler-test-util.lisp index 5720380c0..0be2b6c95 100644 --- a/tests/compiler-test-util.lisp +++ b/tests/compiler-test-util.lisp @@ -56,7 +56,7 @@ (let ((code (fun-code-header (%fun-fun fun)))) (loop for i from sb-vm:code-constants-offset below (code-header-words code) for c = (code-header-ref code i) - for value = (if (= (widetag-of c) sb-vm:value-cell-header-widetag) + for value = (if (= (widetag-of c) sb-vm:value-cell-widetag) (value-cell-ref c) c) when (typep value type) -- 2.11.4.GIT