X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-macs.lisp;h=ae21559eefb9d503c44cc059a8ead7433c316c34;hb=4f8254f9a128aecc02fc53986ddf2645d8810c24;hp=b86d04decb7c9b0e8f4d9f03d37535f0d2b3559d;hpb=1e9966d5f24709d227e20911b4e1ddd27c87a00e;p=sbcl.git diff --git a/src/compiler/generic/vm-macs.lisp b/src/compiler/generic/vm-macs.lisp index b86d04d..ae21559 100644 --- a/src/compiler/generic/vm-macs.lisp +++ b/src/compiler/generic/vm-macs.lisp @@ -33,14 +33,13 @@ (remove-keywords (cddr options) keywords))))) (def!struct (prim-object-slot - (:constructor make-slot (name docs rest-p offset length options)) + (: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)) @@ -79,7 +78,7 @@ (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 + (slots (make-slot slot-name docs rest-p offset (remove-keywords options '(:docs :rest-p :length)))) (let ((offset-sym (symbolicate name "-" slot-name @@ -154,28 +153,46 @@ ;;; For a documentation, see CUT-TO-WIDTH. -;;; hash: name -> { :GOOD | optimizer | ({modular-fun-info}*)} -(defvar *modular-funs* - (make-hash-table :test 'eq)) +(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 + (widths nil)) +(defvar *unsigned-modular-class* (make-modular-class)) +(defvar *signed-modular-class* (make-modular-class)) +(defun find-modular-class (kind) + (ecase kind + (:unsigned *unsigned-modular-class*) + (:signed *signed-modular-class*))) -;;; List of increasing widths -(defvar *modular-funs-widths* nil) (defstruct modular-fun-info (name (missing-arg) :type symbol) (width (missing-arg) :type (integer 0)) (lambda-list (missing-arg) :type list) (prototype (missing-arg) :type symbol)) -(defun find-modular-version (fun-name width) - (let ((infos (gethash fun-name *modular-funs*))) +(defun find-modular-version (fun-name class width) + (let ((infos (gethash fun-name (modular-class-funs (find-modular-class class))))) (if (listp infos) (find-if (lambda (item-width) (>= item-width width)) infos :key #'modular-fun-info-width) infos))) -(defun %define-modular-fun (name lambda-list prototype width) - (let* ((infos (the list (gethash prototype *modular-funs*))) +;;; Return (VALUES prototype-name width) +(defun modular-version-info (name class) + (values-list (gethash name (modular-class-versions (find-modular-class class))))) + +(defun %define-modular-fun (name lambda-list prototype class width) + (let* ((class (find-modular-class class)) + (funs (modular-class-funs class)) + (versions (modular-class-versions class)) + (infos (the list (gethash prototype funs))) (info (find-if (lambda (item-width) (= item-width width)) infos :key #'modular-fun-info-width))) @@ -186,49 +203,59 @@ (setf (modular-fun-info-name info) name) (style-warn "Redefining modular version ~S of ~S for width ~S." name prototype width)) - (setf (gethash prototype *modular-funs*) + (setf (gethash prototype funs) (merge 'list (list (make-modular-fun-info :name name :width width :lambda-list lambda-list :prototype prototype)) infos - #'< :key #'modular-fun-info-width)))) - (setq *modular-funs-widths* - (merge 'list (list width) *modular-funs-widths* #'<))) + #'< :key #'modular-fun-info-width) + (gethash name versions) + (list prototype width))) + (setf (modular-class-widths class) + (merge 'list (list width) (modular-class-widths class) #'<)))) -(defmacro define-modular-fun (name lambda-list prototype width) +(defmacro define-modular-fun (name lambda-list prototype class width) (check-type name symbol) (check-type prototype symbol) + (check-type class (member :unsigned :signed)) (check-type width unsigned-byte) (dolist (arg lambda-list) (when (member arg 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 ,width) + (%define-modular-fun ',name ',lambda-list ',prototype ',class ,width) (defknown ,name ,(mapcar (constantly 'integer) lambda-list) - (unsigned-byte ,width) - (foldable flushable movable)))) + (,(ecase class + (:unsigned 'unsigned-byte) + (:signed 'signed-byte)) + ,width) + (foldable flushable movable) + :derive-type (make-modular-fun-type-deriver + ',prototype ',class ,width)))) -(defun %define-good-modular-fun (name) - (setf (gethash name *modular-funs*) :good) +(defun %define-good-modular-fun (name class) + (setf (gethash name (modular-class-funs (find-modular-class class))) :good) name) -(defmacro define-good-modular-fun (name) +(defmacro define-good-modular-fun (name class) (check-type name symbol) - `(%define-good-modular-fun ',name)) + (check-type class (member :unsigned :signed)) + `(%define-good-modular-fun ',name ',class)) (defmacro define-modular-fun-optimizer - (name ((&rest lambda-list) &key (width (gensym "WIDTH"))) + (name ((&rest lambda-list) class &key (width (gensym "WIDTH"))) &body body) (check-type name symbol) + (check-type class (member :unsigned :signed)) (dolist (arg lambda-list) (when (member arg 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-funs*) + `(setf (gethash ',name (modular-class-funs (find-modular-class ',class))) (lambda (,call ,width) (declare (type basic-combination ,call) (type (integer 0) width))