From bbfff61cef2c6fe35929d46283f3e56fb0fe98b1 Mon Sep 17 00:00:00 2001 From: Thiemo Seufer Date: Tue, 11 Oct 2005 17:37:27 +0000 Subject: [PATCH] 0.9.5.37: Pointer-compare was only used by character-compare. --- src/compiler/mips/char.lisp | 12 ++++++++++-- src/compiler/mips/system.lisp | 37 ++++++++++--------------------------- version.lisp-expr | 2 +- 3 files changed, 21 insertions(+), 30 deletions(-) diff --git a/src/compiler/mips/char.lisp b/src/compiler/mips/char.lisp index 8b8536a..b7d4e94 100644 --- a/src/compiler/mips/char.lisp +++ b/src/compiler/mips/char.lisp @@ -92,10 +92,18 @@ ;;; Comparison of characters. ;;; -(define-vop (character-compare pointer-compare) +(define-vop (character-compare) (:args (x :scs (character-reg)) (y :scs (character-reg))) - (:arg-types character character)) + (:arg-types character character) + (:temporary (:scs (non-descriptor-reg)) temp) + (:conditional) + (:info target not-p) + (:policy :fast-safe) + (:note "inline comparison") + (:variant-vars condition) + (:generator 3 + (three-way-comparison x y condition :unsigned not-p target temp))) (define-vop (fast-char=/character character-compare) (:translate char=) diff --git a/src/compiler/mips/system.lisp b/src/compiler/mips/system.lisp index 93ff2a4..b31d80d 100644 --- a/src/compiler/mips/system.lisp +++ b/src/compiler/mips/system.lisp @@ -1,32 +1,15 @@ -(in-package "SB!VM") - - -;;;; Random pointer comparison VOPs +;;;; MIPS VM definitions of various system hacking operations -(define-vop (pointer-compare) - (:args (x :scs (sap-reg)) - (y :scs (sap-reg))) - (:arg-types system-area-pointer system-area-pointer) - (:temporary (:scs (non-descriptor-reg)) temp) - (:conditional) - (:info target not-p) - (:policy :fast-safe) - (:note "inline comparison") - (:variant-vars condition) - (:generator 3 - (three-way-comparison x y condition :unsigned not-p target temp))) - -#+nil -(macrolet ((frob (name cond) - `(progn - (def-primitive-translator ,name (x y) `(,',name ,x ,y)) - (defknown ,name (t t) boolean (movable foldable flushable)) - (define-vop (,name pointer-compare) - (:translate ,name) - (:variant ,cond))))) - (frob pointer< :lt) - (frob pointer> :gt)) +;;;; 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") ;;;; Type frobbing VOPs diff --git a/version.lisp-expr b/version.lisp-expr index ddc1c29..fe1916d 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.5.36" +"0.9.5.37" -- 1.7.10.4