From 1bb53833bc57b8e98a0febc3730542f23fe7999d Mon Sep 17 00:00:00 2001 From: Stas Boukarev Date: Fri, 15 Sep 2017 16:40:28 +0300 Subject: [PATCH] Remove compiler/*/static-fn.lisp And the static-*-call-named VOPs are no longer optional. --- build-order.lisp-expr | 1 - src/compiler/alpha/static-fn.lisp | 12 ------------ src/compiler/arm/static-fn.lisp | 3 --- src/compiler/arm64/static-fn.lisp | 3 --- src/compiler/hppa/static-fn.lisp | 1 - src/compiler/ir2tran.lisp | 25 ++++--------------------- src/compiler/mips/static-fn.lisp | 3 --- src/compiler/ppc/static-fn.lisp | 3 --- src/compiler/sparc/static-fn.lisp | 3 --- src/compiler/x86-64/static-fn.lisp | 3 --- src/compiler/x86/static-fn.lisp | 3 --- 11 files changed, 4 insertions(+), 56 deletions(-) delete mode 100644 src/compiler/alpha/static-fn.lisp delete mode 100644 src/compiler/arm/static-fn.lisp delete mode 100644 src/compiler/arm64/static-fn.lisp delete mode 100644 src/compiler/hppa/static-fn.lisp delete mode 100644 src/compiler/mips/static-fn.lisp delete mode 100644 src/compiler/ppc/static-fn.lisp delete mode 100644 src/compiler/sparc/static-fn.lisp delete mode 100644 src/compiler/x86-64/static-fn.lisp delete mode 100644 src/compiler/x86/static-fn.lisp diff --git a/build-order.lisp-expr b/build-order.lisp-expr index b68349801..1716cdb22 100644 --- a/build-order.lisp-expr +++ b/build-order.lisp-expr @@ -521,7 +521,6 @@ ("src/compiler/target/system") ("src/compiler/target/char") ("src/compiler/target/memory") - ("src/compiler/target/static-fn") ("src/compiler/target/arith" ;; KLUDGE: for ppc and sparc this appears to be necessary, as it ;; used to be for array VOPs for X86 until ca. 0.8.5.24 when CSR's diff --git a/src/compiler/alpha/static-fn.lisp b/src/compiler/alpha/static-fn.lisp deleted file mode 100644 index 9a99de257..000000000 --- a/src/compiler/alpha/static-fn.lisp +++ /dev/null @@ -1,12 +0,0 @@ -;;;; VOPs and macro magic for calling static functions - -;;;; This software is part of the SBCL system. See the README file for -;;;; more information. -;;;; -;;;; This software is derived from the CMU CL system, which was -;;;; written at Carnegie Mellon University and released into the -;;;; public domain. The software is in the public domain and is -;;;; provided with absolutely no warranty. See the COPYING and CREDITS -;;;; files for more information. - -(in-package "SB!VM") diff --git a/src/compiler/arm/static-fn.lisp b/src/compiler/arm/static-fn.lisp deleted file mode 100644 index 6c8e1b6a5..000000000 --- a/src/compiler/arm/static-fn.lisp +++ /dev/null @@ -1,3 +0,0 @@ -(in-package "SB!VM") - -;;; Do nothing, it's all done by STATIC-CALL-NAMED and STATIC-TAIL-CALL-NAMED diff --git a/src/compiler/arm64/static-fn.lisp b/src/compiler/arm64/static-fn.lisp deleted file mode 100644 index 6c8e1b6a5..000000000 --- a/src/compiler/arm64/static-fn.lisp +++ /dev/null @@ -1,3 +0,0 @@ -(in-package "SB!VM") - -;;; Do nothing, it's all done by STATIC-CALL-NAMED and STATIC-TAIL-CALL-NAMED diff --git a/src/compiler/hppa/static-fn.lisp b/src/compiler/hppa/static-fn.lisp deleted file mode 100644 index 8240e87ee..000000000 --- a/src/compiler/hppa/static-fn.lisp +++ /dev/null @@ -1 +0,0 @@ -(in-package "SB!VM") diff --git a/src/compiler/ir2tran.lisp b/src/compiler/ir2tran.lisp index bd397ea3c..5338b65cc 100644 --- a/src/compiler/ir2tran.lisp +++ b/src/compiler/ir2tran.lisp @@ -1042,12 +1042,7 @@ (if (eq (ir2-lvar-kind 2lvar) :delayed) (let ((name (lvar-fun-name lvar t))) (aver name) - (values (cond #!+(or immobile-code - #.(cl:if (cl:gethash 'sb!c:static-tail-call-named - sb!c::*backend-template-names*) - '(:and) - '(:or))) - ((sb!vm::static-fdefn-offset name) + (values (cond ((sb!vm::static-fdefn-offset name) name) (t ;; Named call to an immobile fdefn from an immobile component @@ -1098,11 +1093,7 @@ (fun-tn old-fp return-pc pass-refs) (nil) nargs (emit-step-p node))) - #!+(and (not immobile-code) - #.(cl:if (cl:gethash 'sb!c:static-tail-call-named - sb!c::*backend-template-names*) - '(:and) - '(:or))) + #!-immobile-code ((eq fun-tn named) (vop* static-tail-call-named node block (old-fp return-pc pass-refs) ; args @@ -1152,11 +1143,7 @@ (cond ((not named) (vop* call node block (fp fun-tn args) (loc-refs) arg-locs nargs nvals (emit-step-p node))) - #!+(and (not immobile-code) - #.(cl:if (cl:gethash 'sb!c:static-call-named - sb!c::*backend-template-names*) - '(:and) - '(:or))) + #!-immobile-code ((eq fun-tn named) (vop* static-call-named node block (fp args) @@ -1185,11 +1172,7 @@ (cond ((not named) (vop* multiple-call node block (fp fun-tn args) (loc-refs) arg-locs nargs (emit-step-p node))) - #!+(and (not immobile-code) - #.(cl:if (cl:gethash 'sb!c:static-multiple-call-named - sb!c::*backend-template-names*) - '(:and) - '(:or))) + #!-immobile-code ((eq fun-tn named) (vop* static-multiple-call-named node block (fp args) diff --git a/src/compiler/mips/static-fn.lisp b/src/compiler/mips/static-fn.lisp deleted file mode 100644 index 6c8e1b6a5..000000000 --- a/src/compiler/mips/static-fn.lisp +++ /dev/null @@ -1,3 +0,0 @@ -(in-package "SB!VM") - -;;; Do nothing, it's all done by STATIC-CALL-NAMED and STATIC-TAIL-CALL-NAMED diff --git a/src/compiler/ppc/static-fn.lisp b/src/compiler/ppc/static-fn.lisp deleted file mode 100644 index 6c8e1b6a5..000000000 --- a/src/compiler/ppc/static-fn.lisp +++ /dev/null @@ -1,3 +0,0 @@ -(in-package "SB!VM") - -;;; Do nothing, it's all done by STATIC-CALL-NAMED and STATIC-TAIL-CALL-NAMED diff --git a/src/compiler/sparc/static-fn.lisp b/src/compiler/sparc/static-fn.lisp deleted file mode 100644 index 6c8e1b6a5..000000000 --- a/src/compiler/sparc/static-fn.lisp +++ /dev/null @@ -1,3 +0,0 @@ -(in-package "SB!VM") - -;;; Do nothing, it's all done by STATIC-CALL-NAMED and STATIC-TAIL-CALL-NAMED diff --git a/src/compiler/x86-64/static-fn.lisp b/src/compiler/x86-64/static-fn.lisp deleted file mode 100644 index 6c8e1b6a5..000000000 --- a/src/compiler/x86-64/static-fn.lisp +++ /dev/null @@ -1,3 +0,0 @@ -(in-package "SB!VM") - -;;; Do nothing, it's all done by STATIC-CALL-NAMED and STATIC-TAIL-CALL-NAMED diff --git a/src/compiler/x86/static-fn.lisp b/src/compiler/x86/static-fn.lisp deleted file mode 100644 index 6c8e1b6a5..000000000 --- a/src/compiler/x86/static-fn.lisp +++ /dev/null @@ -1,3 +0,0 @@ -(in-package "SB!VM") - -;;; Do nothing, it's all done by STATIC-CALL-NAMED and STATIC-TAIL-CALL-NAMED -- 2.11.4.GIT