fix type mismatch

[Nathan Sidwell <nathan@codesourcery.com>]

[-- Attachment #1: Type: text/plain, Size: 430 bytes --]

In renaming the ms1 port, I had a problem rebuilding the autogenerated source 
files.  string-append and string-length complained about being given a symbol. 
I'm using guile 1.6.7.  This patch fixes the three places it was necessary to 
stringize a 'mode'.

ok?

nathan
-- 
Nathan Sidwell    ::   http://www.codesourcery.com   ::     CodeSourcery LLC
nathan@codesourcery.com    ::     http://www.planetfall.pwp.blueyonder.co.uk


[-- Attachment #2: all.diff --]
[-- Type: text/plain, Size: 2045 bytes --]

2005-12-15  Nathan Sidwell  <nathan@codesourcery.com>

	* sid-cpu.scm (-gen-hw-stream-and-destream-fns): Stringize mode
	for concatenation.
	(-hw-gen-write-stack-decl): Likewise.

Index: sid-cpu.scm
===================================================================
RCS file: /cvs/src/src/cgen/sid-cpu.scm,v
retrieving revision 1.14
diff -c -3 -p -r1.14 sid-cpu.scm
*** sid-cpu.scm	28 Oct 2005 19:30:02 -0000	1.14
--- sid-cpu.scm	15 Dec 2005 16:22:09 -0000
*************** namespace @arch@ {
*** 212,218 ****
  	 (write-stacks 
  	  (map (lambda (n) (sa n "_writes"))
  	       (append (map (lambda (r) (gen-c-symbol (obj:name r))) regs)
! 		       (map (lambda (m) (sa m "_memory")) useful-mode-names))))
  	 (stream-reg (lambda (r) 
  		       (let ((rname (sa "hardware." (gen-c-symbol (obj:name r)))))
  			 (if (hw-scalar? r)
--- 212,218 ----
  	 (write-stacks 
  	  (map (lambda (n) (sa n "_writes"))
  	       (append (map (lambda (r) (gen-c-symbol (obj:name r))) regs)
! 		       (map (lambda (m) (sa (object->string m) "_memory")) useful-mode-names))))
  	 (stream-reg (lambda (r) 
  		       (let ((rname (sa "hardware." (gen-c-symbol (obj:name r)))))
  			 (if (hw-scalar? r)
*************** typedef struct {
*** 406,415 ****
  ;	 (pipe-sz (+ 1 (max-delay (cpu-max-delay (current-cpu)))))
  ;	 (sz (* pipe-sz (-worst-case-number-of-writes-to nm))))
  	 
! 	 (mode-pad (spaces (- 4 (string-length mode))))
  	 (stack-name (string-append nm "_writes")))
      (string-append
!      "  write_stack< write<" mode "> >" mode-pad "\t" stack-name "\t[pipe_sz];\n")))
  
  
  (define (-hw-gen-write-struct-decl)
--- 406,415 ----
  ;	 (pipe-sz (+ 1 (max-delay (cpu-max-delay (current-cpu)))))
  ;	 (sz (* pipe-sz (-worst-case-number-of-writes-to nm))))
  	 
! 	 (mode-pad (spaces (- 4 (string-length (object->string mode)))))
  	 (stack-name (string-append nm "_writes")))
      (string-append
!      "  write_stack< write<" (object->string mode) "> >" mode-pad "\t" stack-name "\t[pipe_sz];\n")))
  
  
  (define (-hw-gen-write-struct-decl)