master: Rename call-static-fun to call-lisp-fun

The branch "master" has been updated in SBCL:
       via  0758784246a107603a04cff0628fbfdfdeebb845 (commit)
      from  17e8361de455d7e89c8cf28aea91e3ce035b7853 (commit)

- Log -----------------------------------------------------------------
commit 0758784246a107603a04cff0628fbfdfdeebb845
Author: Douglas Katzman <[email protected]>
Date:   Fri Apr 3 21:13:31 2026 -0400

    Rename call-static-fun to call-lisp-fun
    
    Calling through the linkage table has nothing to do with static space,
    static symbols, or any other concept that "static fun" might imply.
---
 src/assembly/x86-64/arith.lisp      |  8 ++++----
 src/assembly/x86-64/assem-rtns.lisp |  4 ++--
 src/assembly/x86-64/support.lisp    | 10 +++++-----
 src/assembly/x86-64/tramps.lisp     |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/assembly/x86-64/arith.lisp b/src/assembly/x86-64/arith.lisp
index 62b6ba65a..16934dea4 100644
--- a/src/assembly/x86-64/arith.lisp
+++ b/src/assembly/x86-64/arith.lisp
@@ -64,7 +64,7 @@
                 (inst ret)
 
                 DO-STATIC-FUN
-                (tail-call-static-fun ',(symbolicate "TWO-ARG-" fun) 2))))
+                (tail-call-lisp-fun ',(symbolicate "TWO-ARG-" fun) 2))))
 
   (define-generic-arith-routine (+ 10)
     (move res x)
@@ -140,7 +140,7 @@
                         rip-tn))
   (inst clc) (inst ret)
   GENERIC
-  (tail-call-static-fun '%negate 1))
+  (tail-call-lisp-fun '%negate 1))
 
 ;;;; comparison
 
@@ -166,7 +166,7 @@
                 (inst ret)
 
                 DO-STATIC-FUN
-                (call-static-fun ',static-fn 2)
+                (call-lisp-fun ',static-fn 2)
                 ;; X now holds T or NIL corresponding to the answer but it needs
                 ;; to be returned as :L or :G in EFLAGS. We rely on address of T
                 ;; being less address of NIL (asserted above)
@@ -194,7 +194,7 @@
   (inst ret)
 
   DO-STATIC-FUN
-  (call-static-fun 'two-arg-= 2)
+  (call-lisp-fun 'two-arg-= 2)
   (inst sub x null-tn)
   (inst cmp x (static-symbol-offset t)))
 
diff --git a/src/assembly/x86-64/assem-rtns.lisp b/src/assembly/x86-64/assem-rtns.lisp
index df08161d1..cad007afb 100644
--- a/src/assembly/x86-64/assem-rtns.lisp
+++ b/src/assembly/x86-64/assem-rtns.lisp
@@ -370,7 +370,7 @@
      (:res r (descriptor-reg) rdx-offset))
   (progn x r)
   (with-registers-preserved (lisp :except rdx)
-    (call-static-fun 'update-object-layout 1 nil)))
+    (call-lisp-fun 'update-object-layout 1 nil)))
 
 (define-assembly-routine (sb-impl:install-hash-table-lock
                           (:policy :fast-safe)
@@ -380,7 +380,7 @@
      (:res r (descriptor-reg) rdx-offset))
   (progn x r)
   (with-registers-preserved (lisp :except rdx)
-    (call-static-fun 'sb-impl:install-hash-table-lock 1)))
+    (call-lisp-fun 'sb-impl:install-hash-table-lock 1)))
 
 (define-assembly-routine
     (return-values-list (:return-style :none))
diff --git a/src/assembly/x86-64/support.lisp b/src/assembly/x86-64/support.lisp
index 23cd4165b..fb30ecf6f 100644
--- a/src/assembly/x86-64/support.lisp
+++ b/src/assembly/x86-64/support.lisp
@@ -9,7 +9,7 @@
 
 (in-package "SB-VM")
 
-(macrolet ((static-fun-addr (name optimize)
+(macrolet ((linkage-cell (name optimize)
              (declare (ignorable optimize))
              #-immobile-code `(ea (make-fixup ,name :linkage-cell) null-tn)
              ;; With immobile code, there is a choice of calling to the simple-fun
@@ -27,7 +27,7 @@
                   ;; between simple-funs. (However, editcore can and will cause it to occur)
                   (make-fixup ,name :linkage-cell))))
 
-(defun call-static-fun (fun arg-count &optional (optimize t))
+(defun call-lisp-fun (fun arg-count &optional (optimize t))
   (declare (ignorable optimize))
   (inst push rbp-tn)
   (inst mov rbp-tn rsp-tn)
@@ -35,17 +35,17 @@
   (inst mov (ea rsp-tn) rbp-tn)
   (inst mov rbp-tn rsp-tn)
   (inst mov rcx-tn (fixnumize arg-count))
-  (inst call (static-fun-addr fun optimize))
+  (inst call (linkage-cell fun optimize))
   (inst pop rbp-tn))
 
-(defun tail-call-static-fun (fun arg-count &optional (optimize t))
+(defun tail-call-lisp-fun (fun arg-count &optional (optimize t))
   (declare (ignorable optimize))
   (inst push rbp-tn)
   (inst mov rbp-tn rsp-tn)
   (inst sub rsp-tn n-word-bytes)
   (inst push (ea (frame-byte-offset return-pc-save-offset) rbp-tn))
   (inst mov rcx-tn (fixnumize arg-count))
-  (inst jmp (static-fun-addr fun optimize))))
+  (inst jmp (linkage-cell fun optimize))))
 
 (defun test-cpu-feature (bit-number)
   (multiple-value-bind (byte bit) (floor bit-number n-byte-bits)
diff --git a/src/assembly/x86-64/tramps.lisp b/src/assembly/x86-64/tramps.lisp
index d60c6587e..d344fba69 100644
--- a/src/assembly/x86-64/tramps.lisp
+++ b/src/assembly/x86-64/tramps.lisp
@@ -123,7 +123,7 @@
     (dolist (reg save) (inst push reg))
     ;; count of bytes or elements (always at RBP+16) into 2nd arg
     (inst mov rdi-tn (ea 16 rbp-tn))
-    (call-static-fun 'handle-arena-request 2)
+    (call-lisp-fun 'handle-arena-request 2)
     (inst mov rax-tn rdx-tn) ; Lisp result reg into C result reg
     (dolist (reg (reverse save)) (inst pop reg)))
   (emit-begin-pseudo-atomic))

-----------------------------------------------------------------------


hooks/post-receive
-- 
SBCL