2000-10-06 Dave Brolley <brolley@redhat.com>

	* utils-gen.scm (-gen-ifld-extract-base): Compute start position as
	ifld-start + ifld-word-offset.
	(gen-ifld-extract): Check adata-integral-insn? before checking whether
	the field is beyond the base number of bits.
	(gen-define-ifields): Use a base-length of 32 if adata-integral-insn?.
	(gen-extract-ifields): Ditto.
	* gas-test.scm (gentest): Generate backslashes before '[' and ']'
	characters in the regular expression.

diff --git a/ChangeLog b/ChangeLog
index d063baead70c13f082d494b90ec8bf987c9b6b24..77051d801f3e130d5d2d88580a937802542853ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2000-10-06  Dave Brolley  <brolley@redhat.com>
+
+       * utils-gen.scm (-gen-ifld-extract-base): Compute start position as
+       ifld-start + ifld-word-offset.
+       (gen-ifld-extract): Check adata-integral-insn? before checking whether
+       the field is beyond the base number of bits.
+       (gen-define-ifields): Use a base-length of 32 if adata-integral-insn?.
+       (gen-extract-ifields): Ditto.
+       * gas-test.scm (gentest): Generate backslashes before '[' and ']'
+       characters in the regular expression.
+
 2000-10-02  Frank Ch. Eigler  <fche@redhat.com>
 
        * desc-cpu.scm: (gen-operand-decls): Emit MAX_OPERANDS as a

diff --git a/gas-test.scm b/gas-test.scm
index 1883aaee0429618e521aa2221325cccdc85df826..31101b32ae89c232c5cce185bdf6be68f2540b2b 100644 (file)
--- a/gas-test.scm
+++ b/gas-test.scm
@@ -190,7 +190,12 @@ function gentest {
     echo \"#objdump: -dr\" >>${1}.d
     echo \"#name: $1\" >>${1}.d
     $BUILD/../binutils/objdump -dr a.out | \
-       sed -e 's/(/\\\\(/g' -e 's/)/\\\\)/g' -e 's/[+]/\\\\+/g' -e 's/[*]/\\\*/g' | \
+       sed -e 's/(/\\\\(/g' \
+            -e 's/)/\\\\)/g' \
+            -e 's/\\[/\\\\\\[/g' \
+            -e 's/\\]/\\\\\\]/g' \
+            -e 's/[+]/\\\\+/g' \
+            -e 's/[*]/\\\\*/g' | \
        sed -e 's/^.*file format.*$/.*: +file format .*/' \
        >>${1}.d
     rm -f a.out

diff --git a/utils-gen.scm b/utils-gen.scm
index 8678306f1462d0bfe2ab1c805c99d55637abb8f4..64d93c934902ca52a7b7f0aebeab9de41ed93347 100644 (file)
--- a/utils-gen.scm
+++ b/utils-gen.scm
@@ -92,7 +92,8 @@
                        base-value ", "
                        (number->string total-length) ", "
                        ; ??? Is passing total-length right here?
-                       (number->string (ifld-start f total-length)) ", "
+                       (number->string (+ (ifld-start f total-length)
+                                          (ifld-word-offset f))) ", "
                        (number->string (ifld-length f))
                        ")"))
        (decode (ifld-decode f)))
@@ -220,13 +221,12 @@
    indent
    (gen-sym f)
    " = "
-   (if (ifld-beyond-base? f base-length total-length)
-       (-gen-ifld-extract-beyond f base-length total-length var-list)
-       (-gen-ifld-extract-base f 
-                              (if (adata-integral-insn? CURRENT-ARCH)
-                                  total-length
-                                  (min base-length total-length))
-                              base-value))
+   (if (adata-integral-insn? CURRENT-ARCH)
+       (-gen-ifld-extract-base f total-length base-value)
+       (if (ifld-beyond-base? f base-length total-length)
+          (-gen-ifld-extract-beyond f base-length total-length var-list)
+          (-gen-ifld-extract-base f (min base-length total-length)
+                                  base-value)))
    ";"
    (if macro? " \\\n" "\n")
    )
@@ -324,7 +324,9 @@
 ; to each line).
 
 (define (gen-define-ifields ifields total-length indent macro?)
-  (let* ((base-length (state-base-insn-bitsize))
+  (let* ((base-length (if (adata-integral-insn? CURRENT-ARCH)
+                         32
+                         (state-base-insn-bitsize)))
         (chunk-specs (-extract-chunk-specs base-length total-length
                                            (current-arch-default-alignment))))
     (string-list
@@ -439,7 +441,9 @@
 ; doing this for now.
 
 (define (gen-extract-ifields ifields total-length indent macro?)
-  (let* ((base-length (state-base-insn-bitsize))
+  (let* ((base-length (if (adata-integral-insn? CURRENT-ARCH)
+                         32
+                         (state-base-insn-bitsize)))
         (chunk-specs (-extract-chunk-specs base-length total-length
                                            (current-arch-default-alignment))))
     (string-list