Changeset 10753 for trunk/source/compiler/X86/x86-backend.lisp

Timestamp:

Sep 15, 2008, 11:16:09 PM (12 years ago)

Author:

gb

Message:

Pass the backend to MATCH-TEMPLATE-TYPES in LOOKUP-X86-OPCODE.
Accept a "backend" argument in FIXUP-OPCODE-ORDINALS and FIXUP-X86-VINSN-TEMPLATES
and pass it down to MATCH-TEMPLATE-TYPES.

File:

• trunk/source/compiler/X86/x86-backend.lisp (modified) (4 diffs)

trunk/source/compiler/X86/x86-backend.lisp

@@ -73 +73 @@
                  (type2 (optype (car operands))))
             (dolist (template templates)
-              (when (x86::match-template-types template type0 type1 type2)
+              (when (x86::match-template-types template type0 type1 type2 backend)
                 (collect ((types))
                   (if type0 (types type0))
@@ -81 +81 @@
                                   (types))))))))))))
 
-(defun fixup-opcode-ordinals (vinsn-template opcode-templates)
+(defun fixup-opcode-ordinals (vinsn-template opcode-templates &optional (backend *target-backend*))
   (let* ((changed ()))
     (dolist (vinsn-opcode (vinsn-template-opcode-alist vinsn-template))
@@ -89 +89 @@
             (error "Unknown X86 instruction - ~a.  Odd, because it was once a known instruction." name))
         (let* ((new-ordinal (dolist (template opcode-templates)
-                              (when (x86::match-template-types template type0 type1 type2)
+                              (when (x86::match-template-types template type0 type1 type2 backend)
                                 (return (x86::x86-opcode-template-ordinal template))))))
           (unless new-ordinal
@@ -121 +121 @@
 (defparameter *report-missing-vinsns* nil)
 
-(defun fixup-x86-vinsn-templates (template-hash opcode-templates)
+(defun fixup-x86-vinsn-templates (template-hash opcode-templates &optional (backend *target-backend*))
   (maphash #'(lambda (name vinsn-template)
                (if (not (cdr vinsn-template))
                  (when *report-missing-vinsns*
                    (warn "Reference to undefined vinsn ~s" name))
-                 (fixup-opcode-ordinals (cdr vinsn-template) opcode-templates)))
+                 (fixup-opcode-ordinals (cdr vinsn-template) opcode-templates backend)))
            template-hash))