X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-macs.lisp;h=ef031a952cbe5a3af01ff4b5bca8e82f527fdf73;hb=e0697854ef9f4999c8585b64be1b282ce4725176;hp=e9f6a0194d3ca7938b9398332b8ef0856403348d;hpb=f6f238261f95e8ffff2870ed3ac6fc00ddf09ef2;p=sbcl.git

diff --git a/src/compiler/generic/vm-macs.lisp b/src/compiler/generic/vm-macs.lisp
index e9f6a01..ef031a9 100644
--- a/src/compiler/generic/vm-macs.lisp
+++ b/src/compiler/generic/vm-macs.lisp
@@ -152,10 +152,18 @@
 
 ;;; Modular functions
 
-;;; hash: name -> { ({(width . fun)}*) | :good }
+;;; For a documentation, see CUT-TO-WIDTH.
+
+;;; hash: name -> { :GOOD | optimizer | ({modular-fun-info}*)}
 (defvar *modular-funs*
   (make-hash-table :test 'eq))
 
+;;; hash: modular-variant -> (prototype width)
+;;;
+;;; FIXME: Reimplement with generic function names of kind
+;;; (MODULAR-VERSION prototype width)
+(defvar *modular-versions* (make-hash-table :test 'eq))
+
 ;;; List of increasing widths
 (defvar *modular-funs-widths* nil)
 (defstruct modular-fun-info
@@ -166,11 +174,15 @@
 
 (defun find-modular-version (fun-name width)
   (let ((infos (gethash fun-name *modular-funs*)))
-    (if (eq infos :good)
-        :good
+    (if (listp infos)
         (find-if (lambda (item-width) (>= item-width width))
                  infos
-                 :key #'modular-fun-info-width))))
+                 :key #'modular-fun-info-width)
+        infos)))
+
+;;; Return (VALUES prototype-name width)
+(defun modular-version-info (name)
+  (values-list (gethash name *modular-versions*)))
 
 (defun %define-modular-fun (name lambda-list prototype width)
   (let* ((infos (the list (gethash prototype *modular-funs*)))
@@ -191,7 +203,9 @@
                                                   :lambda-list lambda-list
                                                   :prototype prototype))
                      infos
-                     #'< :key #'modular-fun-info-width))))
+                     #'< :key #'modular-fun-info-width)
+              (gethash name *modular-versions*)
+              (list prototype width))))
   (setq *modular-funs-widths*
         (merge 'list (list width) *modular-funs-widths* #'<)))
 
@@ -216,3 +230,22 @@
 (defmacro define-good-modular-fun (name)
   (check-type name symbol)
   `(%define-good-modular-fun ',name))
+
+(defmacro define-modular-fun-optimizer
+    (name ((&rest lambda-list) &key (width (gensym "WIDTH")))
+     &body body)
+  (check-type name symbol)
+  (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*)
+           (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)))))))