* mach.scm (-ifld-already-defined?): New proc.

	(current-ifld-add!): Use it.
	(-op-already-defined?): New proc.
	(current-op-add!): Use it.
	(-insn-already-defined?): New proc.
	(current-insn-add!): Use it.
	(-minsn-already-defined?): New proc.
	(current-minsn-add!): Use it.
	(obj-isa-list): New proc.
	(isa-supports?): Use it.

diff --git a/ChangeLog b/ChangeLog
index 21dbf8bcbb6474fa3d8065905084ea61f8dcf37b..bcd0dcc02fe5ea720a90a297dbee450c90222a4e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-06-19  Doug Evans  <dje@sebabeach.org>
+
+       * mach.scm (-ifld-already-defined?): New proc.
+       (current-ifld-add!): Use it.
+       (-op-already-defined?): New proc.
+       (current-op-add!): Use it.
+       (-insn-already-defined?): New proc.
+       (current-insn-add!): Use it.
+       (-minsn-already-defined?): New proc.
+       (current-minsn-add!): Use it.
+       (obj-isa-list): New proc.
+       (isa-supports?): Use it.
+
 2003-06-10  Doug Evans  <dje@sebabeach.org>
 
        * insn.scm (insn-builtin!): RELAX renamed to RELAXABLE.

diff --git a/mach.scm b/mach.scm
index e0fd6246f3b8c6bb6d3c4b3ac05d57e499eb4d6e..4f6f887939e959c56d4ebd38f5c853214ac5fed7 100644 (file)
--- a/mach.scm
+++ b/mach.scm
@@ -278,7 +278,7 @@
 (define (current-ifld-list) (map cdr (arch-ifld-list CURRENT-ARCH)))
 
 (define (current-ifld-add! f)
-  (if (current-ifld-lookup (obj:name f))
+  (if (-ifld-already-defined? f)
       (parse-error "define-ifield" "ifield already defined" (obj:name f)))
   (arch-set-ifld-list! CURRENT-ARCH
                       (acons (obj:name f) f (arch-ifld-list CURRENT-ARCH)))
@@ -291,12 +291,30 @@
       (assq-ref (arch-ifld-list CURRENT-ARCH) x))
 )
 
+; Return a boolean indicating if <ifield> F is currently defined.
+; This is slightly complicated because multiple isas can have different
+; ifields with the same name.
+
+(define (-ifld-already-defined? f)
+  (let ((iflds (find (lambda (ff) (eq? (obj:name f) (car ff)))
+                    (arch-ifld-list CURRENT-ARCH))))
+    ; We've got all the ifields with the same name,
+    ; now see if any have the same ISA as F.
+    (let ((result #f)
+         (f-isas (obj-isa-list f)))
+      (for-each (lambda (ff)
+                 (if (not (null? (intersection f-isas (obj-isa-list (cdr ff)))))
+                     (set! result #t)))
+               iflds)
+      result))
+)
+
 ; Operands.
 
 (define (current-op-list) (map cdr (arch-op-list CURRENT-ARCH)))
 
 (define (current-op-add! op)
-  (if (current-op-lookup (obj:name op))
+  (if (-op-already-defined? op)
       (parse-error "define-operand" "operand already defined" (obj:name op)))
   (arch-set-op-list! CURRENT-ARCH
                     (acons (obj:name op) op (arch-op-list CURRENT-ARCH)))
@@ -307,6 +325,24 @@
   (assq-ref (arch-op-list CURRENT-ARCH) name)
 )
 
+; Return a boolean indicating if <operand> OP is currently defined.
+; This is slightly complicated because multiple isas can have different
+; operands with the same name.
+
+(define (-op-already-defined? op)
+  (let ((ops (find (lambda (o) (eq? (obj:name op) (car o)))
+                    (arch-op-list CURRENT-ARCH))))
+    ; We've got all the operands with the same name,
+    ; now see if any have the same ISA as OP.
+    (let ((result #f)
+         (op-isas (obj-isa-list op)))
+      (for-each (lambda (o)
+                 (if (not (null? (intersection op-isas (obj-isa-list (cdr o)))))
+                     (set! result #t)))
+               ops)
+      result))
+)
+
 ; Instruction field formats.
 
 (define (current-ifmt-list) (arch-ifmt-list CURRENT-ARCH))
@@ -323,7 +359,7 @@
 (define (current-insn-list) (map cdr (arch-insn-list CURRENT-ARCH)))
 
 (define (current-insn-add! i)
-  (if (current-insn-lookup (obj:name i))
+  (if (-insn-already-defined? i)
       (parse-error "define-insn" "insn already defined" (obj:name i)))
   (arch-set-insn-list! CURRENT-ARCH
                       (acons (obj:name i) i (arch-insn-list CURRENT-ARCH)))
@@ -334,6 +370,24 @@
   (assq-ref (arch-insn-list CURRENT-ARCH) name)
 )
 
+; Return a boolean indicating if <insn> INSN is currently defined.
+; This is slightly complicated because multiple isas can have different
+; insns with the same name.
+
+(define (-insn-already-defined? insn)
+  (let ((insns (find (lambda (i) (eq? (obj:name insn) (car i)))
+                    (arch-insn-list CURRENT-ARCH))))
+    ; We've got all the insns with the same name,
+    ; now see if any have the same ISA as INSN.
+    (let ((result #f)
+         (insn-isas (obj-isa-list insn)))
+      (for-each (lambda (i)
+                 (if (not (null? (intersection insn-isas (obj-isa-list (cdr i)))))
+                     (set! result #t)))
+               insns)
+      result))
+)
+
 ; Return the insn in the `car' position of INSN-LIST.
 
 (define insn-list-car cdar)
@@ -353,7 +407,7 @@
 (define (current-minsn-list) (map cdr (arch-minsn-list CURRENT-ARCH)))
 
 (define (current-minsn-add! m)
-  (if (current-minsn-lookup (obj:name m))
+  (if (-minsn-already-defined? m)
       (parse-error "define-minsn" "macro-insn already defined" (obj:name m)))
   (arch-set-minsn-list! CURRENT-ARCH
                        (acons (obj:name m) m (arch-minsn-list CURRENT-ARCH)))
@@ -364,6 +418,24 @@
   (assq-ref (arch-minsn-list CURRENT-ARCH) name)
 )
 
+; Return a boolean indicating if <macro-insn> MINSN is currently defined.
+; This is slightly complicated because multiple isas can have different
+; macro-insns with the same name.
+
+(define (-minsn-already-defined? m)
+  (let ((minsns (find (lambda (mm) (eq? (obj:name m) (car mm)))
+                     (arch-minsn-list CURRENT-ARCH))))
+    ; We've got all the macro-insns with the same name,
+    ; now see if any have the same ISA as M.
+    (let ((result #f)
+         (m-isas (obj-isa-list m)))
+      (for-each (lambda (mm)
+                 (if (not (null? (intersection m-isas (obj-isa-list (cdr mm)))))
+                     (set! result #t)))
+               minsns)
+      result))
+)
+
 ; rtx subroutines.
 
 (define (current-subr-list) (map cdr (arch-subr-list CURRENT-ARCH)))
@@ -577,11 +649,17 @@
   *UNSPECIFIED*
 )
 
+; Return list of ISA names specified by OBJ.
+
+(define (obj-isa-list obj)
+  (bitset-attr->list (obj-attr-value obj 'ISA))
+)
+
 ; Return #t if <isa> ISA is supported by OBJ.
 ; This is done by looking for the ISA attribute in OBJ.
 
 (define (isa-supports? isa obj)
-  (let ((isas (bitset-attr->list (obj-attr-value obj 'ISA)))
+  (let ((isas (obj-isa-list obj))
        (name (obj:name isa)))
     (->bool (memq name isas)))
 )