[cmucl-commit] [git] CMU Common Lisp branch master updated. snapshot-2013-02-13-g6e4b411
Raymond Toy
rtoy at common-lisp.net
Fri Feb 22 06:21:20 UTC 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMU Common Lisp".
The branch, master has been updated
via 6e4b411893ce81fd30f053f12474c2eeb986e5fa (commit)
from 6a9fd11d55bd794a02ec3686f3811d794aa8ac6d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6e4b411893ce81fd30f053f12474c2eeb986e5fa
Author: Raymond Toy <toy.raymond at gmail.com>
Date: Thu Feb 21 22:21:10 2013 -0800
Remove the :i486 feature.
code/misc.lisp::
* Remove :i486 from *features*
code/multi-proc.lisp::
* Change :i486 to :x86 on the off chance that multi-proc will be
ported to other archs.
compiler/x86/cell.lisp::
compiler/x86/macros.lisp::
compiler/x86/memory.lisp::
* Remove guard on backend-featurep :i486 since we got rid of :i486 and
have it always enabled now.
diff --git a/src/code/misc.lisp b/src/code/misc.lisp
index 7c83587..50639d2 100644
--- a/src/code/misc.lisp
+++ b/src/code/misc.lisp
@@ -134,9 +134,6 @@
;;; Register various Lisp features
-#+i486
-(sys:register-lisp-runtime-feature :i486)
-
#+pentium
(sys:register-lisp-runtime-feature :pentium)
diff --git a/src/code/multi-proc.lisp b/src/code/multi-proc.lisp
index 2aed7a3..8b2df04 100644
--- a/src/code/multi-proc.lisp
+++ b/src/code/multi-proc.lisp
@@ -1886,10 +1886,10 @@
(process-wait whostate
#'(lambda ()
(declare (optimize (speed 3)))
- #-i486
+ #-x86
(unless (lock-process lock)
(setf (lock-process lock) *current-process*))
- #+i486
+ #+x86
(null (kernel:%instance-set-conditional
lock 2 nil *current-process*)))))
@@ -1904,10 +1904,10 @@
whostate timeout
#'(lambda ()
(declare (optimize (speed 3)))
- #-i486
+ #-x86
(unless (lock-process lock)
(setf (lock-process lock) *current-process*))
- #+i486
+ #+x86
(null (kernel:%instance-set-conditional
lock 2 nil *current-process*)))))
@@ -1915,7 +1915,7 @@
;;;
;;; Atomically seize a lock if it's free.
;;;
-#-i486
+#-x86
(defun seize-lock (lock)
(declare (type lock lock)
(optimize (speed 3)))
@@ -1943,9 +1943,9 @@
(when (and (error-check-lock-p ,lock) ,have-lock)
(error "Dead lock"))
(when (or ,have-lock
- #+i486 (null (kernel:%instance-set-conditional
+ #+x86 (null (kernel:%instance-set-conditional
,lock 2 nil *current-process*))
- #-i486 (seize-lock ,lock)
+ #-x86 (seize-lock ,lock)
(if ,timeout
(lock-wait-with-timeout
,lock ,whostate ,timeout)
@@ -1956,19 +1956,19 @@
(when (and (error-check-lock-p ,lock) ,have-lock)
(error "Dead lock"))
(unless (or ,have-lock
- #+i486 (null (kernel:%instance-set-conditional
+ #+x86 (null (kernel:%instance-set-conditional
,lock 2 nil *current-process*))
- #-i486 (seize-lock ,lock))
+ #-x86 (seize-lock ,lock))
(lock-wait ,lock ,whostate))
, at body))
(t
`(when (or (and (recursive-lock-p ,lock) ,have-lock)
- #+i486 (null (kernel:%instance-set-conditional
+ #+x86 (null (kernel:%instance-set-conditional
,lock 2 nil *current-process*))
- #-i486 (seize-lock ,lock))
+ #-x86 (seize-lock ,lock))
, at body)))
(unless ,have-lock
- #+i486 (kernel:%instance-set-conditional
+ #+x86 (kernel:%instance-set-conditional
,lock 2 *current-process* nil)
- #-i486 (when (eq (lock-process ,lock) *current-process*)
+ #-x86 (when (eq (lock-process ,lock) *current-process*)
(setf (lock-process ,lock) nil)))))))
diff --git a/src/compiler/x86/cell.lisp b/src/compiler/x86/cell.lisp
index 2487149..9283a78 100644
--- a/src/compiler/x86/cell.lisp
+++ b/src/compiler/x86/cell.lisp
@@ -383,7 +383,6 @@
(:temporary (:sc descriptor-reg :offset eax-offset
:from (:argument 2) :to :result :target result) eax)
(:results (result :scs (descriptor-reg any-reg)))
- (:guard (backend-featurep :i486))
(:policy :fast-safe)
(:generator 5
(move eax old-value)
diff --git a/src/compiler/x86/macros.lisp b/src/compiler/x86/macros.lisp
index ca2c267..d4659c2 100644
--- a/src/compiler/x86/macros.lisp
+++ b/src/compiler/x86/macros.lisp
@@ -517,7 +517,6 @@
:from (:argument 2) :to :result :target result) eax)
(:results (result :scs ,scs))
(:result-types ,el-type)
- (:guard (backend-featurep :i486))
(:generator 5
(move eax old-value)
(inst cmpxchg (make-ea :dword :base object :index index :scale 1
@@ -537,7 +536,6 @@
:from (:argument 1) :to :result :target result) eax)
(:results (result :scs ,scs))
(:result-types ,el-type)
- (:guard (backend-featurep :i486))
(:generator 4
(move eax old-value)
(inst cmpxchg (make-ea :dword :base object
diff --git a/src/compiler/x86/memory.lisp b/src/compiler/x86/memory.lisp
index 18d5f37..7fc1a10 100644
--- a/src/compiler/x86/memory.lisp
+++ b/src/compiler/x86/memory.lisp
@@ -93,7 +93,6 @@
:from (:argument 1) :to :result :target result) eax)
(:variant-vars offset lowtag)
(:results (result :scs (descriptor-reg any-reg)))
- (:guard (backend-featurep :i486))
(:generator 4
(move eax old-value)
(inst cmpxchg (make-ea :dword :base object
@@ -163,7 +162,6 @@
(:variant-vars base lowtag)
(:results (result :scs (descriptor-reg any-reg)))
(:info offset)
- (:guard (backend-featurep :i486))
(:generator 4
(move eax old-value)
(inst cmpxchg (make-ea :dword :base object
-----------------------------------------------------------------------
Summary of changes:
src/code/misc.lisp | 3 ---
src/code/multi-proc.lisp | 26 +++++++++++++-------------
src/compiler/x86/cell.lisp | 1 -
src/compiler/x86/macros.lisp | 2 --
src/compiler/x86/memory.lisp | 2 --
5 files changed, 13 insertions(+), 21 deletions(-)
hooks/post-receive
--
CMU Common Lisp
More information about the cmucl-commit
mailing list