From 2cfaef2441a0179c1bc3f9ea530d67def140e67b Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Tue, 18 Aug 2009 16:34:41 +0000 Subject: [PATCH] * gas-test.scm (, test-data): Handle () values. (, test-data): Convert symbols to strings before passing to string-append. (, test-data): Enumerate all cases. Emit correctly sized result for scalars. * operand.scm (hw-index-scalar): Set `name'. (hw-index-anyof, hw-index-derived): Ditto. --- ChangeLog | 11 +++++++++++ gas-test.scm | 36 +++++++++++++++++++++++++----------- operand.scm | 3 +++ 3 files changed, 39 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index bf1e648..c7ed689 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2009-08-18 Doug Evans + + * gas-test.scm (, test-data): Handle () values. + (, test-data): Convert symbols to strings before passing + to string-append. + (, test-data): Enumerate all cases. Emit correctly sized + result for scalars. + + * operand.scm (hw-index-scalar): Set `name'. + (hw-index-anyof, hw-index-derived): Ditto. + 2009-08-17 Doug Evans * pmacros.scm (-pmacro-builtin-internal-test): New function. diff --git a/gas-test.scm b/gas-test.scm index 96cea63..7cd08b7 100644 --- a/gas-test.scm +++ b/gas-test.scm @@ -30,25 +30,31 @@ ; in the operand's position. ; For a general assembler operand, just turn the value into a string. + (method-make! 'test-data (lambda (self ops) - (map number->string ops)) + (map (lambda (op) + (cond ((null? op) "") + ((number? op) (number->string op)) + (else (error "unsupported assembler operand" op)))) + ops)) ) ; For a keyword operand, choose the appropriate keyword. + (method-make! 'test-data (lambda (self ops) - (let* ((test-cases (elm-get self 'values)) - (prefix (elm-get self 'prefix))) + (let ((test-cases (elm-get self 'values)) + (prefix (elm-get self 'prefix))) (map (lambda (n) - (string-append - (if (and (not (string=? prefix "")) + (string-append + (if (and (not (string=? prefix "")) (eq? (string-ref prefix 0) #\$)) "\\" "") - prefix - (car (list-ref test-cases n)))) + prefix + (->string (car (list-ref test-cases n))))) ops))) ) @@ -76,6 +82,7 @@ ; Test data for a field is chosen firstly out of some bit patterns, ; then randomly. It is then interpreted based on whether there ; is a decode method. + (method-make! 'test-data (lambda (self n) @@ -104,13 +111,19 @@ (mode:class (ifld-mode self)))))))) ) +;; Return N values for assembler test data, or nil if there are none +;; (e.g. scalars). +;; ??? This also returns nil for str-expr and rtx. + (method-make! 'test-data (lambda (self n) (case (hw-index:type self) ((ifield operand) (send (hw-index:value self) 'test-data n)) - ((constant) (hw-index:value self)) - (else nil))) + ((constant) (make-list n (hw-index:value self))) + ((scalar) (make-list n nil)) + ((str-expr rtx) (make-list n nil)) ;; ??? + (else (error "invalid hw-index type" (hw-index:type self))))) ) (method-make! @@ -141,9 +154,10 @@ ; Input is a list of operand lists. Returns a collated set of test ; inputs. For example: ; ((r0 r1 r2) (r3 r4 r5) (2 3 8)) => ((r0 r3 2) (r1 r4 3) (r2 r5 8)) +; L is a list of lists. All elements must have the same length. (define (-collate-test-set L) - (if (=? (length (car L)) 0) + (if (= (length (car L)) 0) '() (cons (map car L) (-collate-test-set (map cdr L)))) @@ -157,7 +171,7 @@ (define (build-test-set op-list n) (let ((test-data (map (lambda (op) (operand-test-data op n)) op-list)) (len (length op-list))) - (cond ((=? len 0) (list (list))) + (cond ((= len 0) (list (list))) (else (-collate-test-set test-data)))) ) diff --git a/operand.scm b/operand.scm index 56345ff..49a4ae2 100644 --- a/operand.scm +++ b/operand.scm @@ -415,6 +415,7 @@ ; (a) doesn't exist if we're compiled with Hobbit and mode.scm isn't ; and (b) will fail anyway since #f isn't a valid mode. (let ((scalar-index (new ))) + (elm-xset! scalar-index 'name 'hw-index-scalar) (elm-xset! scalar-index 'type 'scalar) (elm-xset! scalar-index 'mode #f) (elm-xset! scalar-index 'value #f) @@ -429,6 +430,7 @@ ; (a) doesn't exist if we're compiled with Hobbit and mode.scm isn't ; and (b) will fail anyway since #f isn't a valid mode. (let ((anyof-index (new ))) + (elm-xset! anyof-index 'name 'hw-index-anyof) (elm-xset! anyof-index 'type 'scalar) (elm-xset! anyof-index 'mode #f) (elm-xset! anyof-index 'value #f) @@ -440,6 +442,7 @@ ; (a) doesn't exist if we're compiled with Hobbit and mode.scm isn't ; and (b) will fail anyway since #f isn't a valid mode. (let ((derived-index (new ))) + (elm-xset! derived-index 'name 'hw-index-derived) (elm-xset! derived-index 'type 'scalar) (elm-xset! derived-index 'mode #f) (elm-xset! derived-index 'value #f) -- 2.43.5