From a5b84ffa6a4599b958f4c856c39e55712ccb8cc2 Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Fri, 11 Jul 2003 08:38:11 +0000 Subject: [PATCH] 0.8.1.31: Delete unused %TEST-LOWTAG-AND-HEADERS type-vop function Minor textual edit to the text at the end of make.sh --- make.sh | 5 +++-- src/compiler/alpha/type-vops.lisp | 7 ------- src/compiler/generic/early-type-vops.lisp | 10 +++------- src/compiler/hppa/type-vops.lisp | 8 -------- src/compiler/mips/type-vops.lisp | 8 -------- src/compiler/ppc/type-vops.lisp | 8 -------- src/compiler/sparc/type-vops.lisp | 8 -------- src/compiler/x86/type-vops.lisp | 6 ------ version.lisp-expr | 2 +- 9 files changed, 7 insertions(+), 55 deletions(-) diff --git a/make.sh b/make.sh index 080b45a..df101ca 100755 --- a/make.sh +++ b/make.sh @@ -123,7 +123,8 @@ sh make-target-contrib.sh || exit 1 # DEFTEST in contrib self-tests and thing that's all that is. So... echo echo The build seems to have finished successfully. If you would like -echo run more extensive tests on the new SBCL, you can try run-tests.sh. -echo +echo run more extensive tests on the new SBCL, you can try +echo " cd tests && sh ./run-tests.sh." +echo "(but expect some failures on non-x86 platforms)." date diff --git a/src/compiler/alpha/type-vops.lisp b/src/compiler/alpha/type-vops.lisp index e1ff161..57e015a 100644 --- a/src/compiler/alpha/type-vops.lisp +++ b/src/compiler/alpha/type-vops.lisp @@ -42,13 +42,6 @@ (inst bne temp target) (inst beq temp target)))) -(defun %test-lowtag-and-headers (value target not-p lowtag - function-p headers &key temp) - (let ((drop-through (gen-label))) - (%test-lowtag value (if not-p drop-through target) nil lowtag :temp temp) - (%test-headers value target not-p function-p headers - :drop-through drop-through :temp temp))) - (defun %test-headers (value target not-p function-p headers &key (drop-through (gen-label)) temp) (let ((lowtag (if function-p fun-pointer-lowtag other-pointer-lowtag))) diff --git a/src/compiler/generic/early-type-vops.lisp b/src/compiler/generic/early-type-vops.lisp index 8b4d96c..fff6768 100644 --- a/src/compiler/generic/early-type-vops.lisp +++ b/src/compiler/generic/early-type-vops.lisp @@ -91,13 +91,9 @@ (lowtags (when (cdr lowtags) (error "can't test multiple lowtags at the same time")) - (if headers - `(%test-lowtag-and-headers - ,value ,target ,not-p ,(car lowtags) - ,function-p ',(canonicalize-headers headers) - ,@other-args) - `(%test-lowtag ,value ,target ,not-p ,(car lowtags) - ,@other-args))) + (when headers + (error "can't test non-fixnum lowtags and headers at the same time")) + `(%test-lowtag ,value ,target ,not-p ,(car lowtags) ,@other-args)) (headers `(%test-headers ,value ,target ,not-p ,function-p ',(canonicalize-headers headers) diff --git a/src/compiler/hppa/type-vops.lisp b/src/compiler/hppa/type-vops.lisp index cf5de08..97687d8 100644 --- a/src/compiler/hppa/type-vops.lisp +++ b/src/compiler/hppa/type-vops.lisp @@ -38,14 +38,6 @@ (inst extru value 31 3 temp)) (inst bci := not-p lowtag temp target))) -(defun %test-lowtag-and-headers (value target not-p lowtag - function-p headers &key temp) - (let ((drop-through (gen-label))) - (%test-lowtag value (if not-p drop-through target) nil lowtag - :temp temp) - (%test-headers value target not-p function-p headers - :drop-through drop-through :temp temp :temp-loaded t))) - (defun %test-headers (value target not-p function-p headers &key temp (drop-through (gen-label)) temp-loaded) (let ((lowtag (if function-p fun-pointer-lowtag other-pointer-lowtag))) diff --git a/src/compiler/mips/type-vops.lisp b/src/compiler/mips/type-vops.lisp index 0864e69..48107f2 100644 --- a/src/compiler/mips/type-vops.lisp +++ b/src/compiler/mips/type-vops.lisp @@ -47,14 +47,6 @@ (unless skip-nop (inst nop)))) -(defun %test-lowtag-and-headers (value target not-p lowtag - function-p headers &key temp) - (let ((drop-through (gen-label))) - (%test-lowtag value (if not-p drop-through target) nil lowtag - :skip-nop t :temp temp) - (%test-headers value target not-p function-p headers - :drop-through drop-through :temp temp))) - (defun %test-headers (value target not-p function-p headers &key (drop-through (gen-label)) temp) (let ((lowtag (if function-p fun-pointer-lowtag other-pointer-lowtag))) diff --git a/src/compiler/ppc/type-vops.lisp b/src/compiler/ppc/type-vops.lisp index 87d5dee..649dd74 100644 --- a/src/compiler/ppc/type-vops.lisp +++ b/src/compiler/ppc/type-vops.lisp @@ -37,14 +37,6 @@ (inst cmpwi temp lowtag) (inst b? (if not-p :ne :eq) target))) -(defun %test-lowtag-and-headers (value target not-p lowtag function-p headers - &key temp) - (let ((drop-through (gen-label))) - (%test-lowtag value (if not-p drop-through target) not-p lowtag - :temp temp) - (%test-headers value target not-p function-p headers - :temp temp :drop-through drop-through))) - (defun %test-headers (value target not-p function-p headers &key temp (drop-through (gen-label))) (let ((lowtag (if function-p fun-pointer-lowtag other-pointer-lowtag))) diff --git a/src/compiler/sparc/type-vops.lisp b/src/compiler/sparc/type-vops.lisp index 3185d8e..f937c6e 100644 --- a/src/compiler/sparc/type-vops.lisp +++ b/src/compiler/sparc/type-vops.lisp @@ -49,14 +49,6 @@ (unless skip-nop (inst nop)))) -(defun %test-lowtag-and-headers (value target not-p lowtag function-p headers - &key temp) - (let ((drop-through (gen-label))) - (%test-lowtag value (if not-p drop-through target) not-p lowtag - :temp temp :skip-nop t) - (%test-headers value target not-p function-p headers - :temp temp :drop-through drop-through))) - (defun %test-headers (value target not-p function-p headers &key temp (drop-through (gen-label))) (let ((lowtag (if function-p fun-pointer-lowtag other-pointer-lowtag))) diff --git a/src/compiler/x86/type-vops.lisp b/src/compiler/x86/type-vops.lisp index 5c3fb79..062c47f 100644 --- a/src/compiler/x86/type-vops.lisp +++ b/src/compiler/x86/type-vops.lisp @@ -65,12 +65,6 @@ (inst cmp al-tn lowtag) (inst jmp (if not-p :ne :e) target)) -(defun %test-lowtag-and-headers (value target not-p lowtag function-p headers) - (let ((drop-through (gen-label))) - (%test-lowtag value (if not-p drop-through target) nil lowtag) - (%test-headers value target not-p function-p headers drop-through t))) - - (defun %test-headers (value target not-p function-p headers &optional (drop-through (gen-label)) al-loaded) (let ((lowtag (if function-p fun-pointer-lowtag other-pointer-lowtag))) diff --git a/version.lisp-expr b/version.lisp-expr index 005da86..ac4f6d1 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.8.1.30" +"0.8.1.31" -- 1.7.10.4