(defun remove-keywords (options keywords)
(cond ((null options) nil)
- ((member (car options) keywords)
- (remove-keywords (cddr options) keywords))
- (t
- (list* (car options) (cadr options)
- (remove-keywords (cddr options) keywords)))))
+ ((member (car options) keywords)
+ (remove-keywords (cddr options) keywords))
+ (t
+ (list* (car options) (cadr options)
+ (remove-keywords (cddr options) keywords)))))
(def!struct (prim-object-slot
- (:constructor make-slot (name docs rest-p offset length options))
- (:make-load-form-fun just-dump-it-normally)
- (:conc-name slot-))
+ (:constructor make-slot (name docs rest-p offset options))
+ (:make-load-form-fun just-dump-it-normally)
+ (:conc-name slot-))
(name nil :type symbol)
(docs nil :type (or null simple-string))
(rest-p nil :type (member t nil))
(offset 0 :type fixnum)
- (length 1 :type fixnum)
(options nil :type list))
(def!struct (primitive-object (:make-load-form-fun just-dump-it-normally))
(options nil :type list)
(slots nil :type list)
(size 0 :type fixnum)
- (var-length nil :type (member t nil)))
+ (variable-length-p nil :type (member t nil)))
(defvar *primitive-objects* nil)
(defun %define-primitive-object (primobj)
(let ((name (primitive-object-name primobj)))
(setf *primitive-objects*
- (cons primobj
- (remove name *primitive-objects*
- :key #'primitive-object-name :test #'eq)))
+ (cons primobj
+ (remove name *primitive-objects*
+ :key #'primitive-object-name :test #'eq)))
name))
(defmacro define-primitive-object
- ((name &key lowtag widetag alloc-trans (type t))
- &rest slot-specs)
+ ((name &key lowtag widetag alloc-trans (type t))
+ &rest slot-specs)
(collect ((slots) (exports) (constants) (forms) (inits))
(let ((offset (if widetag 1 0))
- (var-length nil))
+ (variable-length-p nil))
(dolist (spec slot-specs)
- (when var-length
- (error "No more slots can follow a :rest-p slot."))
- (destructuring-bind
- (slot-name &rest options
- &key docs rest-p (length (if rest-p 0 1))
- ((:type slot-type) t) init
- (ref-known nil ref-known-p) ref-trans
- (set-known nil set-known-p) set-trans
- &allow-other-keys)
- (if (atom spec) (list spec) spec)
- (slots (make-slot slot-name docs rest-p offset length
- (remove-keywords options
- '(:docs :rest-p :length))))
- (let ((offset-sym (symbolicate name "-" slot-name
- (if rest-p "-OFFSET" "-SLOT"))))
- (constants `(defconstant ,offset-sym ,offset
- ,@(when docs (list docs))))
- (exports offset-sym))
- (when ref-trans
- (when ref-known-p
- (forms `(defknown ,ref-trans (,type) ,slot-type ,ref-known)))
- (forms `(def-reffer ,ref-trans ,offset ,lowtag)))
- (when set-trans
- (when set-known-p
- (forms `(defknown ,set-trans
- ,(if (listp set-trans)
- (list slot-type type)
- (list type slot-type))
- ,slot-type
- ,set-known)))
- (forms `(def-setter ,set-trans ,offset ,lowtag)))
- (when init
- (inits (cons init offset)))
- (when rest-p
- (setf var-length t))
- (incf offset length)))
- (unless var-length
- (let ((size (symbolicate name "-SIZE")))
- (constants `(defconstant ,size ,offset))
- (exports size)))
+ (when variable-length-p
+ (error "No more slots can follow a :rest-p slot."))
+ (destructuring-bind
+ (slot-name &rest options
+ &key docs rest-p (length (if rest-p 0 1))
+ ((:type slot-type) t) init
+ (ref-known nil ref-known-p) ref-trans
+ (set-known nil set-known-p) set-trans
+ cas-trans
+ &allow-other-keys)
+ (if (atom spec) (list spec) spec)
+ (slots (make-slot slot-name docs rest-p offset
+ (remove-keywords options
+ '(:docs :rest-p :length))))
+ (let ((offset-sym (symbolicate name "-" slot-name
+ (if rest-p "-OFFSET" "-SLOT"))))
+ (constants `(def!constant ,offset-sym ,offset
+ ,@(when docs (list docs))))
+ (exports offset-sym))
+ (when ref-trans
+ (when ref-known-p
+ (forms `(defknown ,ref-trans (,type) ,slot-type ,ref-known)))
+ (forms `(def-reffer ,ref-trans ,offset ,lowtag)))
+ (when set-trans
+ (when set-known-p
+ (forms `(defknown ,set-trans
+ ,(if (listp set-trans)
+ (list slot-type type)
+ (list type slot-type))
+ ,slot-type
+ ,set-known)))
+ (forms `(def-setter ,set-trans ,offset ,lowtag)))
+ (when cas-trans
+ (when rest-p
+ (error ":REST-P and :CAS-TRANS incompatible."))
+ (forms
+ `(progn
+ (defknown ,cas-trans (,type ,slot-type ,slot-type)
+ ,slot-type ())
+ #!+compare-and-swap-vops
+ (def-casser ,cas-trans ,offset ,lowtag))))
+ (when init
+ (inits (cons init offset)))
+ (when rest-p
+ (setf variable-length-p t))
+ (incf offset length)))
+ (unless variable-length-p
+ (let ((size (symbolicate name "-SIZE")))
+ (constants `(def!constant ,size ,offset))
+ (exports size)))
(when alloc-trans
- (forms `(def-alloc ,alloc-trans ,offset ,var-length ,widetag
- ,lowtag ',(inits))))
+ (forms `(def-alloc ,alloc-trans ,offset
+ ,(if variable-length-p :var-alloc :fixed-alloc)
+ ,widetag
+ ,lowtag ',(inits))))
`(progn
- (eval-when (:compile-toplevel :load-toplevel :execute)
- (%define-primitive-object
- ',(make-primitive-object :name name
- :widetag widetag
- :lowtag lowtag
- :slots (slots)
- :size offset
- :var-length var-length))
- ,@(constants))
- ,@(forms)))))
+ (eval-when (:compile-toplevel :load-toplevel :execute)
+ (%define-primitive-object
+ ',(make-primitive-object :name name
+ :widetag widetag
+ :lowtag lowtag
+ :slots (slots)
+ :size offset
+ :variable-length-p variable-length-p))
+ ,@(constants))
+ ,@(forms)))))
\f
;;;; stuff for defining reffers and setters
(in-package "SB!C")
-(defun %def-reffer (name offset lowtag)
- (let ((info (function-info-or-lose name)))
- (setf (function-info-ir2-convert info)
- #'(lambda (node block)
- (ir2-convert-reffer node block name offset lowtag))))
- name)
-
(defmacro def-reffer (name offset lowtag)
`(%def-reffer ',name ,offset ,lowtag))
-
-(defun %def-setter (name offset lowtag)
- (let ((info (function-info-or-lose name)))
- (setf (function-info-ir2-convert info)
- (if (listp name)
- #'(lambda (node block)
- (ir2-convert-setfer node block name offset lowtag))
- #'(lambda (node block)
- (ir2-convert-setter node block name offset lowtag)))))
- name)
-
(defmacro def-setter (name offset lowtag)
`(%def-setter ',name ,offset ,lowtag))
-
-(defun %def-alloc (name words var-length header lowtag inits)
- (let ((info (function-info-or-lose name)))
- (setf (function-info-ir2-convert info)
- (if var-length
- #'(lambda (node block)
- (ir2-convert-variable-allocation node block name words header
- lowtag inits))
- #'(lambda (node block)
- (ir2-convert-fixed-allocation node block name words header
- lowtag inits)))))
- name)
-
-(defmacro def-alloc (name words var-length header lowtag inits)
- `(%def-alloc ',name ,words ,var-length ,header ,lowtag ,inits))
+(defmacro def-alloc (name words alloc-style header lowtag inits)
+ `(%def-alloc ',name ,words ,alloc-style ,header ,lowtag ,inits))
+#!+compare-and-swap-vops
+(defmacro def-casser (name offset lowtag)
+ `(%def-casser ',name ,offset ,lowtag))
+;;; KLUDGE: The %DEF-FOO functions used to implement the macros here
+;;; are defined later in another file, since they use structure slot
+;;; setters defined later, and we can't have physical forward
+;;; references to structure slot setters because ANSI in its wisdom
+;;; allows the xc host CL to implement structure slot setters as SETF
+;;; expanders instead of SETF functions. -- WHN 2002-02-09
\f
;;;; some general constant definitions
(in-package "SB!C")
;;; the maximum number of SCs in any implementation
-(defconstant sc-number-limit 32)
+(def!constant sc-number-limit 62)
+\f
+;;; Modular functions
+
+;;; For a documentation, see CUT-TO-WIDTH.
+
+(defstruct modular-class
+ ;; hash: name -> { :GOOD | optimizer | ({modular-fun-info}*)}
+ (funs (make-hash-table :test 'eq))
+ ;; hash: modular-variant -> (prototype width)
+ ;;
+ ;; FIXME: Reimplement with generic function names of kind
+ ;; (MODULAR-VERSION prototype width)
+ (versions (make-hash-table :test 'eq))
+ ;; list of increasing widths + signedps
+ (widths nil))
+(defvar *untagged-unsigned-modular-class* (make-modular-class))
+(defvar *untagged-signed-modular-class* (make-modular-class))
+(defvar *tagged-modular-class* (make-modular-class))
+(defun find-modular-class (kind signedp)
+ (ecase kind
+ (:untagged
+ (ecase signedp
+ ((nil) *untagged-unsigned-modular-class*)
+ ((t) *untagged-signed-modular-class*)))
+ (:tagged
+ (aver signedp)
+ *tagged-modular-class*)))
+
+(defstruct modular-fun-info
+ (name (missing-arg) :type symbol)
+ (width (missing-arg) :type (integer 0))
+ (signedp (missing-arg) :type boolean)
+ (lambda-list (missing-arg) :type list)
+ (prototype (missing-arg) :type symbol))
+
+(defun find-modular-version (fun-name kind signedp width)
+ (let ((infos (gethash fun-name (modular-class-funs (find-modular-class kind signedp)))))
+ (if (listp infos)
+ (find-if (lambda (mfi)
+ (aver (eq (modular-fun-info-signedp mfi) signedp))
+ (>= (modular-fun-info-width mfi) width))
+ infos)
+ infos)))
+
+;;; Return (VALUES prototype-name width)
+(defun modular-version-info (name kind signedp)
+ (values-list (gethash name (modular-class-versions (find-modular-class kind signedp)))))
+
+(defun %define-modular-fun (name lambda-list prototype kind signedp width)
+ (let* ((class (find-modular-class kind signedp))
+ (funs (modular-class-funs class))
+ (versions (modular-class-versions class))
+ (infos (the list (gethash prototype funs)))
+ (info (find-if (lambda (mfi)
+ (and (eq (modular-fun-info-signedp mfi) signedp)
+ (= (modular-fun-info-width mfi) width)))
+ infos)))
+ (if info
+ (unless (and (eq name (modular-fun-info-name info))
+ (= (length lambda-list)
+ (length (modular-fun-info-lambda-list info))))
+ (setf (modular-fun-info-name info) name)
+ (style-warn "Redefining modular version ~S of ~S for ~
+ ~:[un~;~]signed width ~S."
+ name prototype signedp width))
+ (setf (gethash prototype funs)
+ (merge 'list
+ (list (make-modular-fun-info :name name
+ :width width
+ :signedp signedp
+ :lambda-list lambda-list
+ :prototype prototype))
+ infos
+ #'< :key #'modular-fun-info-width)
+ (gethash name versions)
+ (list prototype width)))
+ (setf (modular-class-widths class)
+ (merge 'list (list (cons width signedp)) (modular-class-widths class)
+ #'< :key #'car))))
+
+(defmacro define-modular-fun (name lambda-list prototype kind signedp width)
+ (check-type name symbol)
+ (check-type prototype symbol)
+ (check-type kind (member :untagged :tagged))
+ (check-type width unsigned-byte)
+ (dolist (arg lambda-list)
+ (when (member arg sb!xc:lambda-list-keywords)
+ (error "Lambda list keyword ~S is not supported for ~
+ modular function lambda lists." arg)))
+ `(progn
+ (%define-modular-fun ',name ',lambda-list ',prototype ',kind ',signedp ,width)
+ (defknown ,name ,(mapcar (constantly 'integer) lambda-list)
+ (,(ecase signedp
+ ((nil) 'unsigned-byte)
+ ((t) 'signed-byte))
+ ,width)
+ (foldable flushable movable)
+ :derive-type (make-modular-fun-type-deriver
+ ',prototype ',kind ,width ',signedp))))
+
+(defun %define-good-modular-fun (name kind signedp)
+ (setf (gethash name (modular-class-funs (find-modular-class kind signedp))) :good)
+ name)
+
+(defmacro define-good-modular-fun (name kind signedp)
+ (check-type name symbol)
+ (check-type kind (member :untagged :tagged))
+ `(%define-good-modular-fun ',name ',kind ',signedp))
+
+(defmacro define-modular-fun-optimizer
+ (name ((&rest lambda-list) kind signedp &key (width (gensym "WIDTH")))
+ &body body)
+ (check-type name symbol)
+ (check-type kind (member :untagged :tagged))
+ (dolist (arg lambda-list)
+ (when (member arg sb!xc:lambda-list-keywords)
+ (error "Lambda list keyword ~S is not supported for ~
+ modular function lambda lists." arg)))
+ (with-unique-names (call args)
+ `(setf (gethash ',name (modular-class-funs (find-modular-class ',kind ',signedp)))
+ (lambda (,call ,width)
+ (declare (type basic-combination ,call)
+ (type (integer 0) ,width))
+ (let ((,args (basic-combination-args ,call)))
+ (when (= (length ,args) ,(length lambda-list))
+ (destructuring-bind ,lambda-list ,args
+ (declare (type lvar ,@lambda-list))
+ ,@body)))))))
projects / sbcl.git / blobdiff