Rename function subtype widetags to SIMPLE-FUN-WIDETAG, etc.

FUNCALLABLE-INSTANCE-HEADER-WIDETAG is deleted, but the other two
remain for compatibility with many uses outside of SBCL sources,
though they are not used internally.

make-target-2-load.lisp

@@ -97,7 +97,7 @@
  (when (typep obj 'class)
  (when (slot-boundp obj 'sb-pcl::%documentation)
  (clear-it (slot-value obj 'sb-pcl::%documentation)))))
- (#.sb-vm:funcallable-instance-header-widetag
+ (#.sb-vm:funcallable-instance-widetag
  (when (typep obj 'standard-generic-function)
  (when (slot-boundp obj 'sb-pcl::%documentation)
  (clear-it (slot-value obj 'sb-pcl::%documentation)))))))

package-data-list.lisp-expr

@@ -2951,7 +2951,9 @@ structure representations"
  "CATCH-BLOCK-SC-NUMBER" "CATCH-BLOCK-SIZE"
  "CATCH-BLOCK-TAG-SLOT" "CERROR-TRAP"
  "CLOSURE-FUN-SLOT"
- "CLOSURE-HEADER-WIDETAG" "CLOSURE-INFO-OFFSET"
+ "CLOSURE-HEADER-WIDETAG" ; don't use
+ "CLOSURE-WIDETAG"
+ "CLOSURE-INFO-OFFSET"
  "CODE-CODE-SIZE-SLOT" "CODE-CONSTANTS-OFFSET"
  "CODE-DEBUG-INFO-SLOT"
  "CODE-HEADER-WIDETAG" "COMPLEX-ARRAY-WIDETAG"
@@ -3011,11 +3013,12 @@ structure representations"
  "FP-CONSTANT-SC-NUMBER"
  "FP-DOUBLE-ZERO-SC-NUMBER" "FP-SINGLE-ZERO-SC-NUMBER"
  "FUNCALLABLE-INSTANCE-TRAMPOLINE-SLOT"
- "FUNCALLABLE-INSTANCE-HEADER-WIDETAG"
+ "FUNCALLABLE-INSTANCE-WIDETAG"
  "FUNCALLABLE-INSTANCE-INFO-OFFSET"
  "SIMPLE-FUN-ARGLIST-SLOT" "SIMPLE-FUN-CODE-OFFSET"
  "FUN-END-BREAKPOINT-TRAP"
- "SIMPLE-FUN-HEADER-WIDETAG"
+ "SIMPLE-FUN-HEADER-WIDETAG" ; don't use
+ "SIMPLE-FUN-WIDETAG"
  "SIMPLE-FUN-NAME-SLOT"
  "FUN-POINTER-LOWTAG"
  "SIMPLE-FUN-SELF-SLOT"

src/assembly/alpha/tramps.lisp

@@ -16,7 +16,7 @@
  (:temp nl0-tn non-descriptor-reg nl0-offset)
  (:temp ocfp-tn non-descriptor-reg ocfp-offset)
  (:temp lra-tn descriptor-reg lra-offset))
- (inst lword simple-fun-header-widetag) ;; header
+ (inst lword simple-fun-widetag) ;; header
  (inst lword (make-fixup 'undefined-tramp-tagged
  :assembly-routine)) ;; self
  (dotimes (i (- simple-fun-code-offset 2))
@@ -66,7 +66,7 @@
  fun-pointer-lowtag))))
  ((:temp code-tn descriptor-reg code-offset)
  (:temp lexenv-tn descriptor-reg lexenv-offset))
- (inst lword simple-fun-header-widetag)
+ (inst lword simple-fun-widetag)
  (inst lword (make-fixup 'funcallable-instance-tramp
  :assembly-routine))
  (dotimes (i (- simple-fun-code-offset 2))

src/assembly/arm/tramps.lisp

@@ -12,7 +12,7 @@
  (+ xundefined-tramp fun-pointer-lowtag))))
  ((:temp lexenv-tn descriptor-reg lexenv-offset))
  HEADER
- (inst word simple-fun-header-widetag)
+ (inst word simple-fun-widetag)
  (inst word (make-fixup 'undefined-tramp :assembly-routine))
  (dotimes (i (- simple-fun-code-offset 2))
  (inst word nil-value))
@@ -29,7 +29,7 @@
  fun-pointer-lowtag))))
  ((:temp r8-tn unsigned-reg r8-offset))
  HEADER
- (inst word simple-fun-header-widetag)
+ (inst word simple-fun-widetag)
  (inst word (make-fixup 'undefined-alien-tramp-tagged
  :assembly-routine))
  (dotimes (i (- simple-fun-code-offset 2))
@@ -45,7 +45,7 @@
  (:export (closure-tramp
  (+ xclosure-tramp fun-pointer-lowtag))))
  ((:temp lexenv-tn descriptor-reg lexenv-offset))
- (inst word simple-fun-header-widetag)
+ (inst word simple-fun-widetag)
  (inst word (make-fixup 'closure-tramp :assembly-routine))
  (dotimes (i (- simple-fun-code-offset 2))
  (inst word nil-value))
@@ -61,7 +61,7 @@
  (+ xfuncallable-instance-tramp
  fun-pointer-lowtag))))
  ((:temp lexenv-tn descriptor-reg lexenv-offset))
- (inst word simple-fun-header-widetag)
+ (inst word simple-fun-widetag)
  (inst word (make-fixup 'funcallable-instance-tramp :assembly-routine))
  (dotimes (i (- simple-fun-code-offset 2))
  (inst word nil-value))

src/assembly/arm64/tramps.lisp

@@ -14,7 +14,7 @@
  fun-pointer-lowtag))))
  ()
  HEADER
- (inst dword simple-fun-header-widetag)
+ (inst dword simple-fun-widetag)
  (inst dword (make-fixup 'undefined-tramp-tagged
  :assembly-routine))
  (dotimes (i (- simple-fun-code-offset 2))
@@ -33,7 +33,7 @@
  fun-pointer-lowtag))))
  ((:temp r8-tn unsigned-reg r8-offset))
  HEADER
- (inst dword simple-fun-header-widetag)
+ (inst dword simple-fun-widetag)
  (inst dword (make-fixup 'undefined-alien-tramp-tagged
  :assembly-routine))
  (dotimes (i (- simple-fun-code-offset 2))
@@ -51,7 +51,7 @@
  (+ xclosure-tramp
  fun-pointer-lowtag))))
  ()
- (inst dword simple-fun-header-widetag)
+ (inst dword simple-fun-widetag)
  (inst dword (make-fixup 'closure-tramp-tagged
  :assembly-routine))
  (dotimes (i (- simple-fun-code-offset 2))
@@ -70,7 +70,7 @@
  (+ xfuncallable-instance-tramp
  fun-pointer-lowtag))))
  ()
- (inst dword simple-fun-header-widetag)
+ (inst dword simple-fun-widetag)
  (inst dword (make-fixup 'funcallable-instance-tramp :assembly-routine))
  (dotimes (i (- simple-fun-code-offset 2))
  (inst dword nil-value))

src/assembly/hppa/tramps.lisp

@@ -14,7 +14,7 @@
  fun-pointer-lowtag))))
  ((:temp lra-tn descriptor-reg lra-offset)
  (:temp temp non-descriptor-reg nl0-offset))
- (inst word simple-fun-header-widetag) ;; header
+ (inst word simple-fun-widetag) ;; header
  (inst word (make-fixup 'undefined-tramp-tagged
  :assembly-routine)) ;; self
  (dotimes (i (- simple-fun-code-offset 2))
@@ -85,7 +85,7 @@
  (+ funcallable-instance-tramp-header
  fun-pointer-lowtag))))
  nil
- (inst word simple-fun-header-widetag) ;;header
+ (inst word simple-fun-widetag) ;;header
  (inst word (make-fixup 'funcallable-instance-tramp :assembly-routine)) ;; self
  (dotimes (i (- simple-fun-code-offset 2))
  (inst word nil-value))

src/assembly/mips/tramps.lisp

@@ -14,7 +14,7 @@
  fun-pointer-lowtag))))
  ((:temp nl0 unsigned-reg nl0-offset)
  (:temp lra descriptor-reg lra-offset))
- (inst word simple-fun-header-widetag)
+ (inst word simple-fun-widetag)
  (inst word (make-fixup 'undefined-tramp-tagged
  :assembly-routine))
  (dotimes (i (- simple-fun-code-offset 2))
@@ -38,7 +38,7 @@
  (+ xclosure-tramp
  fun-pointer-lowtag))))
  ()
- (inst word simple-fun-header-widetag)
+ (inst word simple-fun-widetag)
  (inst word (make-fixup 'closure-tramp-tagged
  :assembly-routine))
  (dotimes (i (- simple-fun-code-offset 2))
@@ -58,7 +58,7 @@
  (+ xfuncallable-instance-tramp
  fun-pointer-lowtag))))
  ()
- (inst word simple-fun-header-widetag)
+ (inst word simple-fun-widetag)
  (inst word (make-fixup 'funcallable-instance-tramp :assembly-routine))
  (dotimes (i (- simple-fun-code-offset 2))
  (inst word nil-value))

src/assembly/ppc/tramps.lisp

@@ -13,7 +13,7 @@
  (+ xundefined-tramp
  fun-pointer-lowtag))))
  ((:temp fdefn-tn descriptor-reg fdefn-offset))
- (inst word simple-fun-header-widetag) ;; header
+ (inst word simple-fun-widetag) ;; header
  (inst word (make-fixup 'undefined-tramp-tagged
  :assembly-routine)) ;; self
  (dotimes (i (- simple-fun-code-offset 2))
@@ -52,7 +52,7 @@
  (+ xfuncallable-instance-tramp
  fun-pointer-lowtag))))
  ((:temp fdefn-tn descriptor-reg fdefn-offset))
- (inst word simple-fun-header-widetag)
+ (inst word simple-fun-widetag)
  (inst word (make-fixup 'funcallable-instance-tramp :assembly-routine))
  (dotimes (i (- simple-fun-code-offset 2))
  (inst word nil-value))

src/assembly/sparc/tramps.lisp

@@ -12,7 +12,7 @@
  (+ xundefined-tramp fun-pointer-lowtag))))
  ((:temp cname-tn descriptor-reg cname-offset))
  (without-scheduling ()
- (inst word simple-fun-header-widetag)
+ (inst word simple-fun-widetag)
  (inst word (make-fixup 'undefined-tramp :assembly-routine))
  (dotimes (i (- simple-fun-code-offset 2))
  (inst word nil-value))
@@ -27,7 +27,7 @@
  ((:temp lexenv-tn descriptor-reg lexenv-offset)
  (:temp cname-tn descriptor-reg cname-offset))
  (without-scheduling ()
- (inst word simple-fun-header-widetag)
+ (inst word simple-fun-widetag)
  (inst word (make-fixup 'closure-tramp :assembly-routine))
  (dotimes (i (- simple-fun-code-offset 2))
  (inst word nil-value))
@@ -46,7 +46,7 @@
  fun-pointer-lowtag))))
  ((:temp lexenv-tn descriptor-reg lexenv-offset))
  (without-scheduling ()
- (inst word simple-fun-header-widetag)
+ (inst word simple-fun-widetag)
  (inst word (make-fixup 'funcallable-instance-tramp :assembly-routine))
  (dotimes (i (- simple-fun-code-offset 2))
  (inst word nil-value))

src/code/class.lisp

@@ -882,8 +882,8 @@ between the ~A definition and the ~A definition"
  (random-class) ; used for unknown type codes
 
  (function
- :codes (#.sb!vm:closure-header-widetag
- #.sb!vm:simple-fun-header-widetag)
+ :codes (#.sb!vm:closure-widetag
+ #.sb!vm:simple-fun-widetag)
  :state :read-only
  :prototype-form (function (lambda () 42)))
 

src/code/fdefinition.lisp

@@ -162,7 +162,7 @@
  ;; if we already know that FUNCTION is a function.
  ;; It will signal a type error if not, which is the right thing to do anyway.
  ;; (this isn't quite a true predicate)
- (and (= (fun-subtype function) sb!vm:closure-header-widetag)
+ (and (= (fun-subtype function) sb!vm:closure-widetag)
  ;; Prior to cold-init fixing up the load-time-value, this compares
  ;; %closure-fun to 0, which is ok - it returns NIL.
  (eq (load-time-value (%closure-fun (symbol-function '%coerce-name-to-fun))

src/code/room.lisp

@@ -48,7 +48,7 @@
  (make-room-info :name 'bignum
  :kind :other))
 
-(setf (svref *meta-room-info* closure-header-widetag)
+(setf (svref *meta-room-info* closure-widetag)
  (make-room-info :name 'closure
  :kind :closure))
 
@@ -69,7 +69,7 @@
  (make-room-info :name 'instance
  :kind :instance))
 
-(setf (svref *meta-room-info* funcallable-instance-header-widetag)
+(setf (svref *meta-room-info* funcallable-instance-widetag)
  (make-room-info :name 'funcallable-instance
  :kind :closure))
 

src/code/target-misc.lisp

@@ -20,9 +20,9 @@
  (declare (function function))
  ;; It's too bad that TYPECASE isn't able to generate equivalent code.
  (case (fun-subtype function)
- (#.sb!vm:closure-header-widetag
+ (#.sb!vm:closure-widetag
  (%closure-fun function))
- (#.sb!vm:funcallable-instance-header-widetag
+ (#.sb!vm:funcallable-instance-widetag
  ;; %FUNCALLABLE-INSTANCE-FUNCTION is not known to return a FUNCTION.
  ;; Is that right? Shouldn't we always initialize to something
  ;; that is a function, such as an error-signaling trampoline?
@@ -121,7 +121,7 @@
 ;;; or NIL if there's none
 (defun %fun-name (function)
  (case (fun-subtype function)
- (#.sb!vm:funcallable-instance-header-widetag
+ (#.sb!vm:funcallable-instance-widetag
  (let (#!+(or sb-eval sb-fasteval)
  (layout (%funcallable-instance-layout function)))
  ;; We know that funcallable-instance-p is true,
@@ -140,7 +140,7 @@
  function)
  (return-from %fun-name
  (sb!mop:generic-function-name function))))))
- (#.sb!vm:closure-header-widetag
+ (#.sb!vm:closure-widetag
  (multiple-value-bind (name namedp) (closure-name function)
  (when namedp
  (return-from %fun-name name)))))

src/code/x86-64-vm.lisp

@@ -193,7 +193,7 @@
  ;; in arch_write_linkage_table_jmp() and arch_do_displaced_inst().
  (setf (sap-ref-32 sap 0) #x058B48 ; REX MOV [RIP-n]
  (signed-sap-ref-32 sap 3) (- ea (+ (sap-int sap) 7))) ; disp
- (let ((i (if (/= (fun-subtype fun) funcallable-instance-header-widetag)
+ (let ((i (if (/= (fun-subtype fun) funcallable-instance-widetag)
  7
  (let ((disp8 (- (ash funcallable-instance-function-slot
  word-shift)
@@ -264,7 +264,7 @@
  (case (sap-ref-8 (int-sap obj) 0)
  (#.fdefn-widetag
  (make-lisp-obj (logior obj other-pointer-lowtag)))
- (#.funcallable-instance-header-widetag
+ (#.funcallable-instance-widetag
  (make-lisp-obj (logior obj fun-pointer-lowtag)))
  (#.code-header-widetag
  (let ((code (make-lisp-obj (logior obj other-pointer-lowtag))))

src/compiler/alpha/alloc.lisp

@@ -124,7 +124,7 @@
  (let* ((size (+ length closure-info-offset))
  (alloc-size (pad-data-block size)))
  (inst li
- (logior (ash (1- size) n-widetag-bits) closure-header-widetag)
+ (logior (ash (1- size) n-widetag-bits) closure-widetag)
  temp)
  (pseudo-atomic (:extra (if stack-allocate-p 0 alloc-size))
  (cond (stack-allocate-p

src/compiler/alpha/cell.lisp

@@ -142,7 +142,7 @@
  (:generator 38
  (let ((normal-fn (gen-label)))
  (load-type type function (- fun-pointer-lowtag))
- (inst xor type simple-fun-header-widetag type)
+ (inst xor type simple-fun-widetag type)
  (inst addq function
  (- (ash simple-fun-code-offset word-shift) fun-pointer-lowtag)
  lip)

src/compiler/alpha/insts.lisp

@@ -642,7 +642,7 @@
 (define-instruction simple-fun-header-word (segment)
  (:cost 0)
  (:emitter
- (emit-header-data segment simple-fun-header-widetag)))
+ (emit-header-data segment simple-fun-widetag)))
 
 (define-instruction lra-header-word (segment)
  (:cost 0)

src/compiler/arm/alloc.lisp

@@ -128,7 +128,7 @@
  (load-immediate-word pa-flag
  (logior
  (ash (1- size) n-widetag-bits)
- closure-header-widetag))
+ closure-widetag))
  (storew pa-flag result 0 fun-pointer-lowtag)
  (storew function result closure-fun-slot fun-pointer-lowtag)))))
 

src/compiler/arm/cell.lisp

@@ -138,7 +138,7 @@
  (emit-label closure-tramp-fixup)
  (inst word (make-fixup 'closure-tramp :assembly-routine)))
  (load-type type function (- fun-pointer-lowtag))
- (inst cmp type simple-fun-header-widetag)
+ (inst cmp type simple-fun-widetag)
  (inst mov :eq lip function)
  (inst load-from-label :ne lip lip closure-tramp-fixup)
  (storew lip fdefn fdefn-raw-addr-slot other-pointer-lowtag)

src/compiler/arm/insts.lisp

@@ -388,7 +388,7 @@
 
 (define-instruction simple-fun-header-word (segment)
  (:emitter
- (emit-header-data segment simple-fun-header-widetag)))
+ (emit-header-data segment simple-fun-widetag)))
 
 (define-instruction lra-header-word (segment)
  (:emitter
@@ -1186,7 +1186,7 @@
  (inst ldr temp (@ lip (- other-pointer-lowtag)))
  ;; And finally we use the header value (a count in words),
  ;; plus the fact that the top two bits of the widetag are
- ;; clear (SIMPLE-FUN-HEADER-WIDETAG is #x2A and
+ ;; clear (SIMPLE-FUN-WIDETAG is #x2A and
  ;; RETURN-PC-HEADER-WIDETAG is #x36) to compute the boxed
  ;; address of the code component.
  (inst sub code lip (lsr temp (- 8 word-shift))))))))

src/compiler/arm64/alloc.lisp

@@ -127,7 +127,7 @@
  (load-immediate-word pa-flag
  (logior
  (ash (1- size) n-widetag-bits)
- closure-header-widetag))
+ closure-widetag))
  (storew pa-flag result 0 fun-pointer-lowtag)
  (storew function result closure-fun-slot fun-pointer-lowtag)))))
 

src/compiler/arm64/cell.lisp

@@ -256,7 +256,7 @@
  (inst add-sub lip function (- (* simple-fun-code-offset n-word-bytes)
  fun-pointer-lowtag))
  (load-type type function (- fun-pointer-lowtag))
- (inst cmp type simple-fun-header-widetag)
+ (inst cmp type simple-fun-widetag)
  (inst b :eq SIMPLE-FUN)
  (load-inline-constant lip '(:fixup closure-tramp :assembly-routine) lip)
  SIMPLE-FUN

src/compiler/arm64/insts.lisp

@@ -530,7 +530,7 @@
 
 (define-instruction simple-fun-header-word (segment)
  (:emitter
- (emit-header-data segment simple-fun-header-widetag)))
+ (emit-header-data segment simple-fun-widetag)))
 
 (define-instruction lra-header-word (segment)
  (:emitter

src/compiler/generic/core.lisp

@@ -138,7 +138,7 @@
  (error "Can't statically link to undefined function ~S" name))
  ((not (<= sb!vm:immobile-space-start addr sb!vm:immobile-space-end))
  (error "Can't statically link to ~S: code is movable" name))
- ((neq (fun-subtype fun) sb!vm:simple-fun-header-widetag)
+ ((neq (fun-subtype fun) sb!vm:simple-fun-widetag)
  (error "Can't statically link to ~S: non-simple function" name))
  (t
  (sap-ref-word (int-sap addr)