From 434d132bed6f23a9bdc4e35c355cc26b9f454f20 Mon Sep 17 00:00:00 2001 From: Cyrus Harmon Date: Tue, 6 Jun 2006 21:27:46 +0000 Subject: [PATCH] 0.9.13.30 * restore macos/x86 buildability without sb-thread by making the lutex primitive object defintion and %make-lutex and lutexp definitions be #!+sb-lutex not #!+(and sb-lutex sb-thread). --- src/compiler/generic/objdef.lisp | 2 +- src/compiler/generic/vm-fndb.lisp | 46 ++++++++++++++++++------------------- version.lisp-expr | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/compiler/generic/objdef.lisp b/src/compiler/generic/objdef.lisp index 2d80149..b3839eb 100644 --- a/src/compiler/generic/objdef.lisp +++ b/src/compiler/generic/objdef.lisp @@ -395,7 +395,7 @@ (real :c-type "double" :length #!-x86-64 2 #!+x86-64 1) (imag :c-type "double" :length #!-x86-64 2 #!+x86-64 1)) -#!+(and sb-thread sb-lutex) +#!+sb-lutex (define-primitive-object (lutex :lowtag other-pointer-lowtag :widetag lutex-widetag diff --git a/src/compiler/generic/vm-fndb.lisp b/src/compiler/generic/vm-fndb.lisp index 1958967..9636759 100644 --- a/src/compiler/generic/vm-fndb.lisp +++ b/src/compiler/generic/vm-fndb.lisp @@ -116,39 +116,39 @@ (defknown %instance-length (instance) index (foldable flushable)) (defknown %instance-ref (instance index) t - (flushable)) + (flushable always-translatable)) (defknown %instance-set (instance index t) t - (unsafe)) + (unsafe always-translatable)) (defknown %layout-invalid-error (t layout) nil) #!-hppa (progn (defknown %raw-instance-ref/word (instance index) sb!vm:word - (flushable)) + (flushable always-translatable)) (defknown %raw-instance-set/word (instance index sb!vm:word) sb!vm:word - (unsafe)) + (unsafe always-translatable)) (defknown %raw-instance-ref/single (instance index) single-float - (flushable)) + (flushable always-translatable)) (defknown %raw-instance-set/single (instance index single-float) single-float - (unsafe)) + (unsafe always-translatable)) (defknown %raw-instance-ref/double (instance index) double-float - (flushable)) + (flushable always-translatable)) (defknown %raw-instance-set/double (instance index double-float) double-float - (unsafe)) + (unsafe always-translatable)) (defknown %raw-instance-ref/complex-single (instance index) (complex single-float) - (flushable)) + (flushable always-translatable)) (defknown %raw-instance-set/complex-single (instance index (complex single-float)) (complex single-float) - (unsafe)) + (unsafe always-translatable)) (defknown %raw-instance-ref/complex-double (instance index) (complex double-float) - (flushable)) + (flushable always-translatable)) (defknown %raw-instance-set/complex-double (instance index (complex double-float)) (complex double-float) - (unsafe)) + (unsafe always-translatable)) ) ;;; %RAW-{REF,SET}-FOO VOPs should be declared as taking a RAW-VECTOR @@ -170,31 +170,31 @@ sb!vm::simple-array-unsigned-byte-64) (defknown %raw-ref-single (raw-vector index) single-float - (foldable flushable)) + (foldable flushable always-translatable)) (defknown %raw-ref-double (raw-vector index) double-float - (foldable flushable)) + (foldable flushable always-translatable)) #!+long-float (defknown %raw-ref-long (raw-vector index) long-float - (foldable flushable)) + (foldable flushable always-translatable)) (defknown %raw-set-single (raw-vector index single-float) single-float - (unsafe)) + (unsafe always-translatable)) (defknown %raw-set-double (raw-vector index double-float) double-float - (unsafe)) + (unsafe always-translatable)) #!+long-float (defknown %raw-set-long (raw-vector index long-float) long-float - (unsafe)) + (unsafe always-translatable)) (defknown %raw-ref-complex-single (raw-vector index) (complex single-float) - (foldable flushable)) + (foldable flushable always-translatable)) (defknown %raw-ref-complex-double (raw-vector index) (complex double-float) - (foldable flushable)) + (foldable flushable always-translatable)) (defknown %raw-set-complex-single (raw-vector index (complex single-float)) (complex single-float) - (unsafe)) + (unsafe always-translatable)) (defknown %raw-set-complex-double (raw-vector index (complex double-float)) (complex double-float) - (unsafe)) + (unsafe always-translatable)) ) (defknown %raw-bits (t fixnum) sb!vm:word @@ -227,7 +227,7 @@ ;;;; threading -#!+(and sb-thread sb-lutex) +#!+sb-lutex (progn (defknown sb!vm::%make-lutex () sb!vm::lutex ()) (defknown sb!vm::lutexp (t) boolean (foldable flushable))) diff --git a/version.lisp-expr b/version.lisp-expr index 7ba8bbe..c0ec8dc 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.9.13.26" +"0.9.13.30" -- 1.7.10.4