* ifield.scm (ifld-encode-mode): Add FIXME.

	* opcodes.scm (<ifield> 'gen-insert): Handle encode parameters with
	modes.
	(<ifield> 'gen-extract): Similarly.

	* read.scm (parse-error): Handle #f for context-location.
	* utils-cgen.scm (unspecified-location): Fix building of
	single-location.

diff --git a/ChangeLog b/ChangeLog
index c2bd845006942e7d6402c1ecc77624c4220f6f7c..3dd534554453114c773c1af44243c908b3346624 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,20 @@
 2009-08-18  Doug Evans  <dje@sebabeach.org>
 
+       * ifield.scm (ifld-encode-mode): Add FIXME.
+       * opcodes.scm (<ifield> 'gen-insert): Handle encode parameters with
+       modes.
+       (<ifield> 'gen-extract): Similarly.
+
+       * read.scm (parse-error): Handle #f for context-location.
+       * utils-cgen.scm (unspecified-location): Fix building of
+       single-location.
+
        * doc/rtl.texi: Document how to write hex and boolean values.
 
-       * gas-test.scm (<hw-asm>, test-data): Handle () values.
-       (<keyword>, test-data): Convert symbols to strings before passing
+       * gas-test.scm (<hw-asm> test-data): Handle () values.
+       (<keyword> test-data): Convert symbols to strings before passing
        to string-append.
-       (<hw-index>, test-data): Enumerate all cases.  Emit correctly sized
+       (<hw-index> test-data): Enumerate all cases.  Emit correctly sized
        result for scalars.
 
        * operand.scm (hw-index-scalar): Set `name'.

diff --git a/ifield.scm b/ifield.scm
index 16616c1da53de516039c1584c4daecd6d5d9320d..d8dd0c582d8b2b251b336987394aaeaa568b8059 100644 (file)
--- a/ifield.scm
+++ b/ifield.scm
@@ -82,6 +82,8 @@
 (define (ifld-encode-mode f)
   (if (ifld-decode f)
       ; cadr/cadr gets WI in ((value pc) (sra WI ...))
+      ; FIXME: That's wrong for a fully canonical expression like
+      ; ((value pc) (sra () WI ...)).
       (mode:lookup (cadr (cadr (ifld-decode f))))
       (ifld-mode f))
 )

diff --git a/opcodes.scm b/opcodes.scm
index cb2c28b2c95f0403e5831a36257737f65f390ce3..5ed88913f2949f5cde90b77eacaa2e70727b5e39 100644 (file)
--- a/opcodes.scm
+++ b/opcodes.scm
@@ -111,9 +111,13 @@
          "")
       (if encode
          (string-append "        value = "
+                        ;; NOTE: ENCODE is either, e.g.,
+                        ;; ((value pc) (sra DI value 1))
+                        ;; or
+                        ;; (((<mode> value) (<mode> pc)) (sra DI value 1))
                         (let ((expr (cadr encode))
-                              (value (caar encode))
-                              (pc (cadar encode)))
+                              (value (if (symbol? (caar encode)) (caar encode) (cadr (caar encode))))
+                              (pc (if (symbol? (cadar encode)) (cadar encode) (cadr (cadar encode)))))
                           (rtl-c DFLT expr
                                  (list (list value (obj:name (ifld-encode-mode self)) "value")
                                        (list pc 'IAI "pc"))))
@@ -190,9 +194,13 @@
       ");\n"
       (if decode
          (string-append "        value = "
+                        ;; NOTE: DECODE is either, e.g.,
+                        ;; ((value pc) (sll DI value 1))
+                        ;; or
+                        ;; (((<mode> value) (<mode> pc)) (sll DI value 1))
                         (let ((expr (cadr decode))
-                              (value (caar decode))
-                              (pc (cadar decode)))
+                              (value (if (symbol? (caar decode)) (caar decode) (cadr (caar decode))))
+                              (pc (if (symbol? (cadar decode)) (cadar decode) (cadr (cadar decode)))))
                           (rtl-c DFLT expr
                                  (list (list value (obj:name (ifld-decode-mode self)) "value")
                                        (list pc 'IAI "pc"))))

diff --git a/read.scm b/read.scm
index 1eca9826ceb62eea725c141c6ffaf40dd07b0837..b66a1a667b82afbad5680fb3efeb669e4bfceec4 100644 (file)
--- a/read.scm
+++ b/read.scm
@@ -313,7 +313,7 @@
 (define (parse-error context message expr . maybe-help-text)
   (if (not context)
       (set! context (make <context> (current-reader-location) #f)))
-  (let* ((loc (context-location context))
+  (let* ((loc (or (context-location context) (unspecified-location)))
         (top-sloc (location-top loc))
         (prefix (context-prefix context)))
     (error

diff --git a/utils-cgen.scm b/utils-cgen.scm
index 2ee2a507f657cb3937657fdb1c29168920656105..662b7a424b34316ace351d263022f62d5eb663a1 100644 (file)
--- a/utils-cgen.scm
+++ b/utils-cgen.scm
@@ -85,6 +85,7 @@
 ;;; A single source location.
 ;;; This is recorded as a vector for simplicity.
 ;;; END? is true if the location marks the end of the expression.
+;;; NOTE: LINE and COLUMN are origin-0 (the first line is line 0).
 
 (define (make-single-location file line column end?)
   (vector file line column end?)
@@ -171,10 +172,12 @@
 )
 
 ;;; Return an unspecified <location>.
-;;; This is for use in debugging utilities.
+;;; This is mainly for use in debugging utilities.
+;;; Ideally for .cpu-file related stuff we always have a location,
+;;; but that's not always true.
 
 (define (unspecified-location)
-  (make <location> (list (cons "unspecified" 1)))
+  (make <location> (list (make-single-location "unspecified" 0 0 #f)))
 )
 
 ;;; Return a <location> object for the current input port.