* sid-cpu.scm (-gen-hw-stream-and-destream-fns): Stringize mode

	for concatenation.
	(-hw-gen-write-stack-decl): Likewise.

diff --git a/cgen/ChangeLog b/cgen/ChangeLog
index 656508b..7b5f708 100644 (file)
--- a/cgen/ChangeLog
+++ b/cgen/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-28  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * sid-cpu.scm (-gen-hw-stream-and-destream-fns): Stringize mode
+       for concatenation.
+       (-hw-gen-write-stack-decl): Likewise.
+
 2005-12-05  Hans-Peter Nilsson  <hp@axis.com>
 
        * utils-sim.scm (-gen-decode-insn-entry): Correct last change for

diff --git a/cgen/sid-cpu.scm b/cgen/sid-cpu.scm
index 213688d..977af27 100644 (file)
--- a/cgen/sid-cpu.scm
+++ b/cgen/sid-cpu.scm
@@ -212,7 +212,7 @@ namespace @arch@ {
         (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))))
+                      (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)
@@ -406,10 +406,10 @@ typedef struct {
 ;       (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))))
+        (mode-pad (spaces (- 4 (string-length (object->string mode)))))
         (stack-name (string-append nm "_writes")))
     (string-append
-     "  write_stack< write<" mode "> >" mode-pad "\t" stack-name "\t[pipe_sz];\n")))
+     "  write_stack< write<" (object->string mode) "> >" mode-pad "\t" stack-name "\t[pipe_sz];\n")))
 
 
 (define (-hw-gen-write-struct-decl)