From 993fb4527de00eac33c829de67924cbe3056c3c5 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Wed, 12 Sep 2007 22:50:38 +0000 Subject: * bits.lisp: New. Import boot-pkg. * bits.lisp.pamphlet: Move content to bits.lisp. Remove. * Makefile.pamphlet (bits.$(FASLEXT)): New rule. --- src/interp/ChangeLog | 6 +++ src/interp/Makefile.in | 3 ++ src/interp/Makefile.pamphlet | 3 ++ src/interp/bits.lisp | 72 +++++++++++++++++++++++++++++++ src/interp/bits.lisp.pamphlet | 99 ------------------------------------------- 5 files changed, 84 insertions(+), 99 deletions(-) create mode 100644 src/interp/bits.lisp delete mode 100644 src/interp/bits.lisp.pamphlet (limited to 'src') diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog index 6a564d6d..d5e66e73 100644 --- a/src/interp/ChangeLog +++ b/src/interp/ChangeLog @@ -1,3 +1,9 @@ +2007-09-12 Gabriel Dos Reis + + * bits.lisp: New. Import boot-pkg. + * bits.lisp.pamphlet: Move content to bits.lisp. Remove. + * Makefile.pamphlet (bits.$(FASLEXT)): New rule. + 2007-09-12 Gabriel Dos Reis * Makefile.pamphlet (cstream.$(FASLEXT)): New rule. diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in index d8f00284..445c20e5 100644 --- a/src/interp/Makefile.in +++ b/src/interp/Makefile.in @@ -480,6 +480,9 @@ $(AUTO)/%.$(FASLEXT): %.$(FASLEXT) cstream.$(FASLEXT): cstream.clisp sys-macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< +bits.$(FASLEXT): bits.lisp boot-pkg.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + dq.$(FASLEXT): dq.boot boot-pkg.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet index fe3e5fc6..61d396de 100644 --- a/src/interp/Makefile.pamphlet +++ b/src/interp/Makefile.pamphlet @@ -1975,6 +1975,9 @@ $(AUTO)/%.$(FASLEXT): %.$(FASLEXT) cstream.$(FASLEXT): cstream.clisp sys-macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< +bits.$(FASLEXT): bits.lisp boot-pkg.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + dq.$(FASLEXT): dq.boot boot-pkg.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< diff --git a/src/interp/bits.lisp b/src/interp/bits.lisp new file mode 100644 index 00000000..d6f26708 --- /dev/null +++ b/src/interp/bits.lisp @@ -0,0 +1,72 @@ +;; Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. +;; All rights reserved. +;; +;; Redistribution and use in source and binary forms, with or without +;; modification, are permitted provided that the following conditions are +;; met: +;; +;; - Redistributions of source code must retain the above copyright +;; notice, this list of conditions and the following disclaimer. +;; +;; - Redistributions in binary form must reproduce the above copyright +;; notice, this list of conditions and the following disclaimer in +;; the documentation and/or other materials provided with the +;; distribution. +;; +;; - Neither the name of The Numerical ALgorithms Group Ltd. nor the +;; names of its contributors may be used to endorse or promote products +;; derived from this software without specific prior written permission. +;; +;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +;; IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +;; TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +;; PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER +;; OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +;; EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +;; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +;; PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +;; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +;; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +;;; The types "bit" and "bit vector" are implemented differently +;;; in different variants of lisp. +;;; These lisp macros/functions will have different implementations +;;; on different lisp systems. + +;;; The operations which traverse entire vectors are given as functions +;;; since the function calling overhead will be relatively small. +;;; The operations which extract or set a single part of the vector are +;;; provided as macros. + +(IMPORT-MODULE "boot-pkg") +(in-package "BOOT") + +;;; SMW Nov 88: Created + +(defmacro truth-to-bit (x) `(cond (,x 1) ('else 0))) +(defmacro bit-to-truth (b) `(eq ,b 1)) + +(defun bvec-make-full (n x) + (make-array (list n) :element-type 'bit :initial-element x)) + +(defmacro bvec-elt (bv i) `(sbit ,bv ,i)) +(defmacro bvec-setelt (bv i x) `(setf (sbit ,bv ,i) ,x)) +(defmacro bvec-size (bv) `(size ,bv)) + +(defun bvec-copy (bv) (copy-seq bv)) +(defun bvec-concat (bv1 bv2) (concatenate '(vector bit) bv1 bv2)) +(defun bvec-equal (bv1 bv2) (equal bv1 bv2)) +(defun bvec-greater (bv1 bv2) + (let ((pos (mismatch bv1 bv2))) + (cond ((or (null pos) (>= pos (length bv1))) nil) + ((< pos (length bv2)) (> (bit bv1 pos) (bit bv2 pos))) + ((find 1 bv1 :start pos) t) + (t nil)))) +(defun bvec-and (bv1 bv2) (bit-and bv1 bv2)) +(defun bvec-or (bv1 bv2) (bit-ior bv1 bv2)) +(defun bvec-xor (bv1 bv2) (bit-xor bv1 bv2)) +(defun bvec-nand (bv1 bv2) (bit-nand bv1 bv2)) +(defun bvec-nor (bv1 bv2) (bit-nor bv1 bv2)) +(defun bvec-not (bv) (bit-not bv)) diff --git a/src/interp/bits.lisp.pamphlet b/src/interp/bits.lisp.pamphlet deleted file mode 100644 index 1b38eadf..00000000 --- a/src/interp/bits.lisp.pamphlet +++ /dev/null @@ -1,99 +0,0 @@ -%% Oh Emacs, this is a -*- Lisp -*- file despite apperance. -\documentclass{article} -\usepackage{axiom} - -\title{\File{src/interp/bits.lisp} Pamphlet} -\author{Timothy Daly} - -\begin{document} - -\maketitle -\begin{abstract} -\end{abstract} - -\tableofcontents -\eject - -\section{License} - -<>= -;; Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. -;; All rights reserved. -;; -;; Redistribution and use in source and binary forms, with or without -;; modification, are permitted provided that the following conditions are -;; met: -;; -;; - Redistributions of source code must retain the above copyright -;; notice, this list of conditions and the following disclaimer. -;; -;; - Redistributions in binary form must reproduce the above copyright -;; notice, this list of conditions and the following disclaimer in -;; the documentation and/or other materials provided with the -;; distribution. -;; -;; - Neither the name of The Numerical ALgorithms Group Ltd. nor the -;; names of its contributors may be used to endorse or promote products -;; derived from this software without specific prior written permission. -;; -;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -;; IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -;; TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -;; PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER -;; OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -;; EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -;; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -;; PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -;; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -;; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -@ -<<*>>= -<> - -;;; The types "bit" and "bit vector" are implemented differently -;;; in different variants of lisp. -;;; These lisp macros/functions will have different implementations -;;; on different lisp systems. - -;;; The operations which traverse entire vectors are given as functions -;;; since the function calling overhead will be relatively small. -;;; The operations which extract or set a single part of the vector are -;;; provided as macros. - -(in-package "BOOT") - -;;; SMW Nov 88: Created - -(defmacro truth-to-bit (x) `(cond (,x 1) ('else 0))) -(defmacro bit-to-truth (b) `(eq ,b 1)) - -(defun bvec-make-full (n x) - (make-array (list n) :element-type 'bit :initial-element x)) - -(defmacro bvec-elt (bv i) `(sbit ,bv ,i)) -(defmacro bvec-setelt (bv i x) `(setf (sbit ,bv ,i) ,x)) -(defmacro bvec-size (bv) `(size ,bv)) - -(defun bvec-copy (bv) (copy-seq bv)) -(defun bvec-concat (bv1 bv2) (concatenate '(vector bit) bv1 bv2)) -(defun bvec-equal (bv1 bv2) (equal bv1 bv2)) -(defun bvec-greater (bv1 bv2) - (let ((pos (mismatch bv1 bv2))) - (cond ((or (null pos) (>= pos (length bv1))) nil) - ((< pos (length bv2)) (> (bit bv1 pos) (bit bv2 pos))) - ((find 1 bv1 :start pos) t) - (t nil)))) -(defun bvec-and (bv1 bv2) (bit-and bv1 bv2)) -(defun bvec-or (bv1 bv2) (bit-ior bv1 bv2)) -(defun bvec-xor (bv1 bv2) (bit-xor bv1 bv2)) -(defun bvec-nand (bv1 bv2) (bit-nand bv1 bv2)) -(defun bvec-nor (bv1 bv2) (bit-nor bv1 bv2)) -(defun bvec-not (bv) (bit-not bv)) -@ -\eject -\begin{thebibliography}{99} -\bibitem{1} nothing -\end{thebibliography} -\end{document} -- cgit v1.2.3